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

getword(), change signature

This commit is contained in:
rlar 2017-11-12 21:13:26 +01:00
parent d3d966b027
commit d17bcbc276
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontend/numparam/xpressn.c
View File

@ -1316,12 +1316,11 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
} }
static void static const char *
getword(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) getword(char * const s, SPICE_DSTRINGPTR tstr_p, const char *iptr)
/* isolate a word from s after position "after". return i= last read+1 */ /* isolate a word from s after position "after". return i= last read+1 */
{ {
const char *iptr = *pi; char *ls_ptr = s + (int) strlen(s);
const char * const ls_ptr = s + (int) strlen(s);
do do
iptr++; iptr++;
@ -1334,7 +1333,7 @@ getword(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi)
iptr++; iptr++;
} }
*pi = iptr; return iptr;
} }
@ -1462,7 +1461,7 @@ nupa_assignment(dico_t *dico, char *s, char mode)
while ((i < ls) && !error) { while ((i < ls) && !error) {
const char *tmp = s + i; const char *tmp = s + i;
getword(s, &tstr, &tmp); tmp = getword(s, &tstr, tmp);
i = (int) (tmp - s); i = (int) (tmp - s);
t_p = spice_dstring_value(&tstr); t_p = spice_dstring_value(&tstr);
if (t_p[0] == '\0') if (t_p[0] == '\0')