From 6a9248f1111dac0e5d8fde10ae39042e805db7fc Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 18 Nov 2017 18:37:05 +0100 Subject: [PATCH] findsubckt(), use skip_back_ws() --- src/frontend/numparam/xpressn.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 750c68589..7c852bd43 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -13,6 +13,7 @@ #include "ngspice/dvec.h" #include "../frontend/variable.h" #include "ngspice/compatmode.h" +#include "ngspice/stringskip.h" /* random numbers in /maths/misc/randnumb.c */ @@ -555,13 +556,11 @@ findsubckt(dico_t *dico, const char * const s) spice_dstring_init(&ustr); - while ((name_e > s) && (name_e[-1] <= ' ')) - name_e--; + name_e = skip_back_ws(name_e, s); name_b = name_e; - while ((name_b > s) && (name_b[-1] > ' ')) - name_b--; + name_b = skip_back_non_ws(name_b, s); pscopy_up(&ustr, name_b, 0, (int) (name_e - name_b)); entry = entrynb(dico, spice_dstring_value(&ustr));