From 81cb1ed674b00166bb86571b8e108d204e3807b8 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 15 May 2016 20:24:36 +0200
Subject: [PATCH] nupa_substitute(), drop s_

---
 src/frontend/numparam/numparam.h | 2 +-
 src/frontend/numparam/xpressn.c  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/frontend/numparam/numparam.h b/src/frontend/numparam/numparam.h
index 162c6f782..386aa56c6 100644
--- a/src/frontend/numparam/numparam.h
+++ b/src/frontend/numparam/numparam.h
@@ -65,7 +65,7 @@ int donedico(dico_t *);
 void dico_free_entry(entry_t *);
 bool defsubckt(dico_t *, struct card *, nupa_type categ);
 int findsubckt(dico_t *, char *s);
-bool nupa_substitute(dico_t *, char *s, char *r);
+bool nupa_substitute(dico_t *, const char *s, char *r);
 bool nupa_assignment(dico_t *, char *s, char mode);
 bool nupa_subcktcall(dico_t *, char *s, char *x, char *inst_name);
 void nupa_subcktexit(dico_t *);
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 585194a85..c5ad37f57 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -1187,7 +1187,7 @@ insertnumber(dico_t *dico, int i, char *s, SPICE_DSTRINGPTR ustr_p)
 
 
 bool
-nupa_substitute(dico_t *dico, char * const s_, char *r)
+nupa_substitute(dico_t *dico, const char *s, char *r)
 /* s: pointer to original source line.
    r: pointer to result line, already heavily modified wrt s
    anywhere we find a 10-char numstring in r, substitute it.
@@ -1203,9 +1203,7 @@ nupa_substitute(dico_t *dico, char * const s_, char *r)
 
     spice_dstring_init(&qstr);
     spice_dstring_init(&tstr);
-    const char *s;
-    s = s_;
-    const char * const s_end = strchr(s_, '\0');
+    const char * const s_end = strchr(s, '\0');
     const char *kptr;
 
     while ((s < s_end) && !err) {