From 0784f76e514112b5cae1e74c121e713bfccee3fe Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 3 Aug 2016 21:12:31 +0200
Subject: [PATCH] variables, cleanup the for loops

---
 src/frontend/variable.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/frontend/variable.c b/src/frontend/variable.c
index fbcbf0c9b..a0f2d317b 100644
--- a/src/frontend/variable.c
+++ b/src/frontend/variable.c
@@ -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;