luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

variables, cleanup the for loops

This commit is contained in:
rlar 2016-08-03 21:12:31 +02:00
parent e39119c1c8
commit 0784f76e51
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontend/variable.c
View File

@ -410,27 +410,18 @@ cp_remvar(char *varname)
uv1 = cp_usrvars();
p = &variables;
for (; *p;) {
for (p = &variables; *p; p = &(*p)->va_next)
if (eq((*p)->va_name, varname))
break;
p = &(*p)->va_next;
}
if (*p == NULL) {
p = &uv1;
for (; *p;) {
for (p = &uv1; *p; p = &(*p)->va_next)
if (eq((*p)->va_name, varname))
break;
p = &(*p)->va_next;
}
}
if (*p == NULL && ft_curckt) {
p = &ft_curckt->ci_vars;
for (; *p;) {
for (p = &ft_curckt->ci_vars; *p; p = &(*p)->va_next)
if (eq((*p)->va_name, varname))
break;
p = &(*p)->va_next;
}
}
v = *p;
if (!v) {
@ -486,12 +477,9 @@ cp_remvar(char *varname)
/* variables processed by if_option(ft_curckt->ci_ckt, ...) */
fprintf(stderr, "it's a US_SIMVAR!\n");
if (ft_curckt) {
p = &ft_curckt->ci_vars;
for (; *p;) {
for (p = &ft_curckt->ci_vars; *p; p = &(*p)->va_next)
if (eq(varname, (*p)->va_name))
break;
p = &(*p)->va_next;
}
if (*p) {
struct variable *u = *p;
*p = u->va_next;