From d12679fccd6838da8364c77e3e8aac639bf57d34 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Mon, 21 Mar 2016 18:02:28 +0100
Subject: [PATCH] skip-ws, #4/6, drop `TEMPORARY_SKIP_WS_X0'

use TEMPORARY_SKIP_WS_X1 instead of TEMPORARY_SKIP_WS_X0
---
 src/frontend/com_let.c           |  2 +-
 src/frontend/dimens.c            |  6 +++---
 src/frontend/help/textdisp.c     |  2 +-
 src/frontend/inp.c               |  2 +-
 src/frontend/newcoms.c           |  4 ++--
 src/frontend/nutinp.c            |  2 +-
 src/frontend/subckt.c            | 10 +++++-----
 src/include/ngspice/stringskip.h |  1 -
 src/misc/tilde.c                 |  2 +-
 9 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/frontend/com_let.c b/src/frontend/com_let.c
index 17eb1d43a..255b01a74 100644
--- a/src/frontend/com_let.c
+++ b/src/frontend/com_let.c
@@ -113,7 +113,7 @@ com_let(wordlist *wl)
             free_pnode(names); /* frees also t, if pnode `names' is simple value */
 
             s = q;
-            TEMPORARY_SKIP_WS_X0(s);
+            TEMPORARY_SKIP_WS_X1(s);
         }
     }
     /* vector name at p */
diff --git a/src/frontend/dimens.c b/src/frontend/dimens.c
index d3574f049..94db9f8ef 100644
--- a/src/frontend/dimens.c
+++ b/src/frontend/dimens.c
@@ -133,11 +133,11 @@ atodims(char *p, int *data, int *outlength)
         return 0;
     }
 
-    TEMPORARY_SKIP_WS_X0(p);
+    TEMPORARY_SKIP_WS_X1(p);
 
     if (*p == '[') {
         p++;
-        TEMPORARY_SKIP_WS_X0(p);
+        TEMPORARY_SKIP_WS_X1(p);
         needbracket = 1;
     }
 
@@ -184,7 +184,7 @@ atodims(char *p, int *data, int *outlength)
             break;
         }
 
-        TEMPORARY_SKIP_WS_X0(p);
+        TEMPORARY_SKIP_WS_X1(p);
     }
 
     *outlength = length;
diff --git a/src/frontend/help/textdisp.c b/src/frontend/help/textdisp.c
index 3cefac15d..97a6c632b 100644
--- a/src/frontend/help/textdisp.c
+++ b/src/frontend/help/textdisp.c
@@ -74,7 +74,7 @@ hlp_thandle(topic **parent)
         }
 
         s = buf;
-        TEMPORARY_SKIP_WS_X0(s);
+        TEMPORARY_SKIP_WS_X1(s);
         switch (*s) {
         case '?':
             fprintf(cp_out,
diff --git a/src/frontend/inp.c b/src/frontend/inp.c
index e42cd50d2..c5ea7519e 100644
--- a/src/frontend/inp.c
+++ b/src/frontend/inp.c
@@ -420,7 +420,7 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
             /* Put the first token from line into s */
             strncpy(name, dd->li_line, BSIZE_SP);
             s = name;
-            TEMPORARY_SKIP_WS_X0(s);
+            TEMPORARY_SKIP_WS_X1(s);
             t = s;
             TEMPORARY_SKIP_NON_WS_X0(t);
             *t = '\0';
diff --git a/src/frontend/newcoms.c b/src/frontend/newcoms.c
index fb2f6f494..8fdadf793 100644
--- a/src/frontend/newcoms.c
+++ b/src/frontend/newcoms.c
@@ -80,7 +80,7 @@ com_reshape(wordlist *wl)
                 wlast = wlast->wl_next;
             }
 
-            TEMPORARY_SKIP_WS_X0(p);
+            TEMPORARY_SKIP_WS_X1(p);
 
             switch (state) {
             case 0: /* p just at or before a number */
@@ -131,7 +131,7 @@ com_reshape(wordlist *wl)
                 }
             }
 
-            TEMPORARY_SKIP_WS_X0(p);
+            TEMPORARY_SKIP_WS_X1(p);
 
         } while (state < 3);
 
diff --git a/src/frontend/nutinp.c b/src/frontend/nutinp.c
index ac8687e2d..2a3beb728 100644
--- a/src/frontend/nutinp.c
+++ b/src/frontend/nutinp.c
@@ -95,7 +95,7 @@ inp_nutsource(FILE *fp, bool comfile, char *filename)
             }
             (void) strncpy(name, dd->li_line, BSIZE_SP);
             s = name;
-            TEMPORARY_SKIP_WS_X0(s);
+            TEMPORARY_SKIP_WS_X1(s);
             t = s;
             TEMPORARY_SKIP_NON_WS_X0(t);
             *t = '\0';
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 27a641875..c9d3d8b50 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -322,7 +322,7 @@ inp_subcktexpand(struct line *deck) {
             continue;   /* skip .commands */
         } else {        /* any other line . . . */
             TEMPORARY_SKIP_NON_WS_X0(s);
-            TEMPORARY_SKIP_WS_X0(s);
+            TEMPORARY_SKIP_WS_X1(s);
 
             if (*s == '(') {
                 int level = 0;
@@ -1310,7 +1310,7 @@ finishLine(struct bxx_buffer *t, char *src, char *scname)
             continue;
         }
         s = src + 1;
-        TEMPORARY_SKIP_WS_X0(s);
+        TEMPORARY_SKIP_WS_X1(s);
         if (!*s || (*s != '(')) {
             lastwasalpha = isalpha_c(*src);
             bxx_putc(t, *src++);
@@ -1467,7 +1467,7 @@ numnodes(char *name, struct subs *subs, wordlist const *modnames)
     const wordlist *wl;
     int n, i, gotit;
 
-    TEMPORARY_SKIP_WS_X0(name);
+    TEMPORARY_SKIP_WS_X1(name);
 
     c = *name;
     if (isupper_c(c))
@@ -1571,7 +1571,7 @@ static int
 numdevs(char *s)
 {
 
-    TEMPORARY_SKIP_WS_X0(s);
+    TEMPORARY_SKIP_WS_X1(s);
     switch (*s) {
     case 'K':
     case 'k':
@@ -1680,7 +1680,7 @@ devmodtranslate(struct line *s, char *subname, wordlist * const orig_modnames)
         printf("In devmodtranslate, examining line %s.\n", t);
 #endif
 
-        TEMPORARY_SKIP_WS_X0(t);
+        TEMPORARY_SKIP_WS_X1(t);
         c = *t;                           /* set c to first char in line. . . . */
         if (isupper_c(c))
             c = tolower_c(c);
diff --git a/src/include/ngspice/stringskip.h b/src/include/ngspice/stringskip.h
index b5047fe82..f16333424 100644
--- a/src/include/ngspice/stringskip.h
+++ b/src/include/ngspice/stringskip.h
@@ -2,7 +2,6 @@
 #define ngspice_STRINGSKIP_H
 
 #define TEMPORARY_SKIP_NON_WS_X0(s)  do { while (*(s) && !isspace_c(*(s))) (s)++; } while(0)
-#define TEMPORARY_SKIP_WS_X0(s)      do { while (*(s) &&  isspace_c(*(s))) (s)++; } while(0)
 #define TEMPORARY_SKIP_WS_X1(s)      do { while (         isspace_c(*(s))) (s)++; } while(0)
 
 #endif
diff --git a/src/misc/tilde.c b/src/misc/tilde.c
index 54b510be8..c200a9cc9 100644
--- a/src/misc/tilde.c
+++ b/src/misc/tilde.c
@@ -43,7 +43,7 @@ tildexpand(char *string)
     if (!string)
 	return NULL;
 
-    TEMPORARY_SKIP_WS_X0(string);
+    TEMPORARY_SKIP_WS_X1(string);
 
     if (*string != '~')
         return copy(string);