From e290e55f31b9d7780fe422de466bcdaa5f5fd44b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 31 Dec 2014 15:04:04 +0100
Subject: [PATCH] inpcom.c, cleanup inp_remove_ws(), #3/5, drop `curr', use `s'
 instead

---
 src/frontend/inpcom.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 23b3c4228..eaf71c15b 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -2196,39 +2196,38 @@ inp_fix_subckt(struct names *subckt_w_params, char *s)
 
 
 static char*
-inp_remove_ws(char * const s_)
+inp_remove_ws(char *s)
 {
-    char *x = s_;
+    char *x = s;
     char *big_buff;
     int  big_buff_index = 0;
-    char *buffer, *curr;
+    char *buffer;
     bool is_expression = FALSE;
 
-    big_buff = TMALLOC(char, strlen(s_) + 2);
-    curr = s_;
+    big_buff = TMALLOC(char, strlen(s) + 2);
 
-    while (*curr != '\0') {
-        if (*curr == '{')
+    while (*s != '\0') {
+        if (*s == '{')
             is_expression = TRUE;
-        if (*curr == '}')
+        if (*s == '}')
             is_expression = FALSE;
 
-        big_buff[big_buff_index++] = *curr;
-        if (*curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ','))) {
-            curr = skip_ws(curr + 1);
+        big_buff[big_buff_index++] = *s;
+        if (*s == '=' || (is_expression && (is_arith_char(*s) || *s == ','))) {
+            s = skip_ws(s + 1);
 
-            if (*curr == '{')
+            if (*s == '{')
                 is_expression = TRUE;
-            if (*curr == '}')
+            if (*s == '}')
                 is_expression = FALSE;
 
-            big_buff[big_buff_index++] = *curr;
+            big_buff[big_buff_index++] = *s;
         }
-        if (*curr != '\0')
-            curr++;
-        if (isspace(*curr)) {
-            curr = skip_ws(curr);
-            if (!(*curr == '\0' || *curr == '=' || (is_expression && (is_arith_char(*curr) || *curr == ','))))
+        if (*s != '\0')
+            s++;
+        if (isspace(*s)) {
+            s = skip_ws(s);
+            if (!(*s == '\0' || *s == '=' || (is_expression && (is_arith_char(*s) || *s == ','))))
                 big_buff[big_buff_index++] = ' ';
         }
     }