mirror of
https://git.code.sf.net/p/ngspice/ngspice
synced 2026-09-04 11:09:28 +02:00
skip-ws, #6/6, rename to match inpcom.c
This commit is contained in:
+8
-8
@@ -283,7 +283,7 @@ gettok(char **s)
|
||||
char *beg, *token ; /* return token */
|
||||
|
||||
paren = 0;
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
if (!**s)
|
||||
return (NULL);
|
||||
beg = *s ;
|
||||
@@ -357,7 +357,7 @@ gettok_noparens(char **s)
|
||||
char c;
|
||||
char *beg, *token ; /* return token */
|
||||
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
|
||||
if (!**s)
|
||||
return (NULL); /* return NULL if we come to end of line */
|
||||
@@ -375,7 +375,7 @@ gettok_noparens(char **s)
|
||||
token = copy_substring(beg, *s) ;
|
||||
|
||||
/* Now iterate up to next non-whitespace char */
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
|
||||
return ( token ) ;
|
||||
}
|
||||
@@ -386,7 +386,7 @@ gettok_instance(char **s)
|
||||
char c;
|
||||
char *beg, *token ; /* return token */
|
||||
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
|
||||
if (!**s)
|
||||
return (NULL); /* return NULL if we come to end of line */
|
||||
@@ -403,7 +403,7 @@ gettok_instance(char **s)
|
||||
token = copy_substring(beg, *s) ;
|
||||
|
||||
/* Now iterate up to next non-whitespace char */
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
|
||||
return ( token ) ;
|
||||
}
|
||||
@@ -420,7 +420,7 @@ gettok_char(char **s, char p, bool inc_p, bool nested)
|
||||
char c;
|
||||
char *beg, *token ; /* return token */
|
||||
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
|
||||
if (!**s)
|
||||
return (NULL); /* return NULL if we come to end of line */
|
||||
@@ -467,7 +467,7 @@ gettok_char(char **s, char p, bool inc_p, bool nested)
|
||||
token = copy_substring(beg, *s) ;
|
||||
|
||||
/* Now iterate up to next non-whitespace char */
|
||||
*s = TEMPORARY_SKIP_WS_X1(*s);
|
||||
*s = skip_ws(*s);
|
||||
|
||||
return ( token ) ;
|
||||
}
|
||||
@@ -664,7 +664,7 @@ get_comma_separated_values( char *values[], char *str ) {
|
||||
values[count++] = strdup(str);
|
||||
*ptr = keep;
|
||||
str = comma_ptr + 1;
|
||||
str = TEMPORARY_SKIP_WS_X1(str);
|
||||
str = skip_ws(str);
|
||||
}
|
||||
values[count++] = strdup(str);
|
||||
return count;
|
||||
|
||||
Reference in New Issue
Block a user