Browse Source

txl/txlsetup.c, cpl/cplsetup.c, avoid warning, rename nested local `x1'

pre-master-46
rlar 10 years ago
parent
commit
d47f073550
  1. 5
      src/spicelib/devices/cpl/cplsetup.c
  2. 5
      src/spicelib/devices/txl/txlsetup.c

5
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); fprintf(stderr, "..1.. %e\n", x*x*x+a1*x*x+a2*x+a3);
*/ */
{ {
double x1;
double x_backup = x;
int i = 0; int i = 0;
x1 = x;
for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4; for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4;
t = root3(a1, a2, a3, x)) t = root3(a1, a2, a3, x))
if (++i == 32) { if (++i == 32) {
x = x1;
x = x_backup;
break; break;
} else } else
x = t; x = t;

5
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; int i = 0;
x1 = x;
for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4; for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4;
t = root3(a1, a2, a3, x)) t = root3(a1, a2, a3, x))
if (++i == 32) { if (++i == 32) {
x = x1;
x = x_backup;
break; break;
} else } else
x = t; x = t;

Loading…
Cancel
Save