From d9a2cec430063378de54769cc2644f5417acc43d Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 22 May 2016 13:01:50 +0200 Subject: [PATCH] getword(), drop s_end argument, which is always == s + strlen(s) --- src/frontend/numparam/xpressn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 00053002d..c254746c0 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -1317,8 +1317,10 @@ nupa_substitute(dico_t *dico, const char *s, char *r) static const char * -getword(const char *s, const char * const s_end, SPICE_DSTRINGPTR tstr_p) +getword(const char *s, SPICE_DSTRINGPTR tstr_p) { + const char *s_end = s + strlen(s); + while ((s < s_end - 1) && !alfa(*s)) s++; @@ -1454,7 +1456,7 @@ nupa_assignment(dico_t *dico, char *s, char mode) while ((i < ls) && !error) { - i = (int) (getword(s + i, s + strlen(s), &tstr) + 1 - s); + i = (int) (getword(s + i, &tstr) + 1 - s); t_p = spice_dstring_value(&tstr); if (t_p[0] == '\0') error = message(dico, " Identifier expected\n");