From d47f073550a5522438b1b4c919e43c2da51bd875 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 13 Dec 2015 14:17:16 +0100
Subject: [PATCH] txl/txlsetup.c, cpl/cplsetup.c, avoid warning, rename nested
 local `x1'

---
 src/spicelib/devices/cpl/cplsetup.c | 5 ++---
 src/spicelib/devices/txl/txlsetup.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c
index 579a39936..e70d9ce7d 100644
--- a/src/spicelib/devices/cpl/cplsetup.c
+++ b/src/spicelib/devices/cpl/cplsetup.c
@@ -1807,13 +1807,12 @@ find_roots(double a1, double a2, double a3, double *x1, double *x2, double *x3)
     fprintf(stderr, "..1.. %e\n", x*x*x+a1*x*x+a2*x+a3);
      */
     {
-        double x1;
+        double x_backup = x;
         int i = 0;
-        x1 = x;
         for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4;
                 t = root3(a1, a2, a3, x))
             if (++i == 32) {
-                x = x1;
+                x = x_backup;
                 break;
             } else
                 x = t;
diff --git a/src/spicelib/devices/txl/txlsetup.c b/src/spicelib/devices/txl/txlsetup.c
index 1bb8d10f9..fb0a48c0a 100644
--- a/src/spicelib/devices/txl/txlsetup.c
+++ b/src/spicelib/devices/txl/txlsetup.c
@@ -1122,13 +1122,12 @@ find_roots(double a1, double a2, double a3, double *x1, double *x2, double *x3)
       }
    }
    {
-      double x1;
+      double x_backup = x;
       int i = 0;
-      x1 = x;
       for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4;
 			t = root3(a1, a2, a3, x))
          if (++i == 32) {
-	    x = x1;
+	    x = x_backup;
 	    break;
 	 } else
 	    x = t;