From 9ff93246b6597fb9d9be93189e5274c3039f0b61 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 18 Nov 2017 13:05:30 +0100 Subject: [PATCH] getexpress(), ia_ptr ==> xiaptr + 1 --- src/frontend/numparam/xpressn.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 8bb02f3b2..e37519371 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -1340,7 +1340,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) returns tpe=='R' if (numeric, 'S' if (string only */ { - const char *ia_ptr; + const char *xia_ptr; const char *ls_ptr; const char *p = *pi - 1; int level; @@ -1348,15 +1348,15 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) nupa_type tpe; ls_ptr = s + strlen(s); - ia_ptr = (p + 1) + 1; + (xia_ptr + 1) = (p + 1) + 1; - while ((ia_ptr < ls_ptr) && (ia_ptr[-1] <= ' ')) - ia_ptr++; /*white space ? */ + while (((xia_ptr + 1) < ls_ptr) && ((xia_ptr + 1)[-1] <= ' ')) + (xia_ptr + 1)++; /*white space ? */ - if (ia_ptr[-1] == '"') { + if ((xia_ptr + 1)[-1] == '"') { /* string constant */ - ia_ptr++; - p = ia_ptr - 1; + (xia_ptr + 1)++; + p = (xia_ptr + 1) - 1; while (((p + 1) < ls_ptr) && (*p != '"')) p++; @@ -1369,10 +1369,10 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) } else { - if (ia_ptr[-1] == '{') - ia_ptr++; + if ((xia_ptr + 1)[-1] == '{') + (xia_ptr + 1)++; - p = ia_ptr - 1 - 1; + p = (xia_ptr + 1) - 1 - 1; do { @@ -1408,7 +1408,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi) tpe = NUPA_REAL; } - pscopy(tstr_p, ia_ptr - 1, 0, (int) (p + 1 - ia_ptr)); + pscopy(tstr_p, (xia_ptr + 1) - 1, 0, (int) (p + 1 - (xia_ptr + 1))); if (*p == '}') p++;