From 10aaa7bcc041927148a6bac4240f71a8fadcb3a6 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 6 May 2016 20:08:06 +0200
Subject: [PATCH] getword(), rename variables

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

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 3b4aac964..1367ecbb3 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1317,21 +1317,21 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
 
 
 static const char *
-getword(const char *iptr, const char * const ls_ptr, SPICE_DSTRINGPTR tstr_p)
+getword(const char *s, const char * const s_end, SPICE_DSTRINGPTR tstr_p)
 /* isolate a word from s after position "after". return i= last read+1 */
 {
     do
-        iptr++;
-    while ((iptr < ls_ptr) && !alfa(iptr[-1]));
+        s++;
+    while ((s < s_end) && !alfa(s[-1]));
 
     spice_dstring_reinit(tstr_p);
 
-    while ((iptr <= ls_ptr) && (alfa(iptr[-1]) || isdigit_c(iptr[-1]))) {
-        cadd(tstr_p, toupper_c(iptr[-1]));
-        iptr++;
+    while ((s <= s_end) && (alfa(s[-1]) || isdigit_c(s[-1]))) {
+        cadd(tstr_p, toupper_c(s[-1]));
+        s++;
     }
 
-    return iptr;
+    return s;
 }