From 8bded8b878073222d22a11f34cb57f4dc2d35800 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 18 Nov 2017 15:33:31 +0100
Subject: [PATCH] nupa_assignment(), cleanup

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

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index dd2fa9946..e7c2acd70 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1433,7 +1433,7 @@ nupa_assignment(dico_t *dico, const char * const s, char mode)
     spice_dstring_init(&ustr);
     error = 0;
 
-    while (((p - s) < (s_end - s)) && (*p <= ' '))
+    while ((p < s_end) && (*p <= ' '))
         p++;
 
     if (*p == Intro)
@@ -1443,7 +1443,7 @@ nupa_assignment(dico_t *dico, const char * const s, char mode)
         while (*p > ' ')
             p++;
 
-    while (((p - s) < (s_end - s)) && !error) {
+    while ((p < s_end) && !error) {
 
         p = getword(p, &tstr) + 1;
         t_p = spice_dstring_value(&tstr);
@@ -1452,13 +1452,13 @@ nupa_assignment(dico_t *dico, const char * const s, char mode)
 
         if (!error) {
             /* assignment expressions */
-            while (((p - s) <= (s_end - s)) && (p[-1] != '='))
+            while ((p <= s_end) && (p[-1] != '='))
                 p++;
 
-            if ((p - s) > (s_end - s))
+            if (p > s_end)
                 error = message(dico, " = sign expected.\n");
 
-            const char *tmp = s + (p - s);
+            const char *tmp = p;
             tmp = getexpress(&dtype, &ustr, tmp) + 1;
             p = tmp;
 
@@ -1478,7 +1478,7 @@ nupa_assignment(dico_t *dico, const char * const s, char mode)
             error = error || err;
         }
 
-        if (((p - s) < (s_end - s)) && (p[-1] != ';'))
+        if ((p < s_end) && (p[-1] != ';'))
             error = message(dico, " ; sign expected.\n");
         /* else
            p++; */