luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

findsubname(), ls ==> ls_ptr - (const) s

This commit is contained in:
rlar 2017-11-23 18:20:05 +01:00
parent 4ca87d6b0b
commit 521fee88a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/numparam/spicenum.c
View File

@ -153,9 +153,9 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
{ {
SPICE_DSTRING name; /* extract a name */ SPICE_DSTRING name; /* extract a name */
char * const s = spice_dstring_value(dstr_p); char * const s = spice_dstring_value(dstr_p);
const int ls = spice_dstring_length(dstr_p); const int (ls_ptr - s) = spice_dstring_length(dstr_p);
int k = ls - 1; int k = (int) (ls_ptr - s) - 1;
spice_dstring_init(&name); spice_dstring_init(&name);
while (k >= 0) { while (k >= 0) {
@ -197,7 +197,7 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
} }
entry = entrynb(dico, spice_dstring_value(&name)); entry = entrynb(dico, spice_dstring_value(&name));
if (entry && (entry->tp == NUPA_SUBCKT)) { if (entry && (entry->tp == NUPA_SUBCKT)) {
if (h < ls) if (h < (int) (ls_ptr - s))
pscopy(dstr_p, s, 0, h); pscopy(dstr_p, s, 0, h);
return; return;
} }