From d6801c0cf1356bd2d624ffbfc23715a348bd691a Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 1 May 2016 17:32:56 +0200
Subject: [PATCH] getword(), substitute s = s - 1

---
 src/frontend/numparam/xpressn.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 66ad227aa..6953423ed 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1326,12 +1326,12 @@ getword(const char *s, const char * const s_end, SPICE_DSTRINGPTR tstr_p)
 
     spice_dstring_reinit(tstr_p);
 
-    while ((s - 1 < s_end) && (alfa(s[-1]) || isdigit_c(s[-1]))) {
-        cadd(tstr_p, toupper_c(s[-1]));
-        s++;
-    }
+    s--;
 
-    return s;
+    while ((s < s_end) && (alfa(*s) || isdigit_c(*s)))
+        cadd(tstr_p, toupper_c(*s++));
+
+    return s + 1;
 }