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

nupa_subcktcall(), drop j1 and t_p1, use a pointer instead

This commit is contained in:
rlar 2017-11-19 11:44:07 +01:00
parent c133f21ef7
commit 53adeee1d3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontend/numparam/xpressn.c
View File

@ -1489,7 +1489,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
x= a matching subckt call line, with actual params x= a matching subckt call line, with actual params
*/ */
{ {
int n, i, j1, found_j, k, g, h, narg = 0, nest; int n, i, found_j, k, g, h, narg = 0, nest;
SPICE_DSTRING subname; SPICE_DSTRING subname;
SPICE_DSTRING tstr; SPICE_DSTRING tstr;
SPICE_DSTRING ustr; SPICE_DSTRING ustr;
@ -1497,7 +1497,6 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
SPICE_DSTRING idlist; SPICE_DSTRING idlist;
SPICE_DSTRING parsebuf; SPICE_DSTRING parsebuf;
char *buf, *token; char *buf, *token;
char *t_p1;
char *u_p; char *u_p;
bool found; bool found;
bool err = 0; bool err = 0;
@ -1513,17 +1512,15 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
scopy_up(&tstr, s); scopy_up(&tstr, s);
j1 = spos_("SUBCKT", spice_dstring_value(&tstr)); const char *j2 = strstr(spice_dstring_value(&tstr), "SUBCKT");
if (j2) {
j2 = j2 + 6; /* fetch its name - skip subckt */
while (*j2 && (*j2 <= ' '))
j2++;
if (j1 >= 0) { while (*j2 && (*j2 != ' ')) {
j1 = j1 + 6; /* fetch its name - skip subckt */ cadd(&subname, *j2);
t_p1 = spice_dstring_value(&tstr); j2++;
while (t_p1[j1] && (t_p1[j1] <= ' '))
j1++;
while (t_p1[j1] && (t_p1[j1] != ' ')) {
cadd(&subname, t_p1[j1]);
j1++;
} }
} else { } else {
err = message(dico, " ! a subckt line!\n"); err = message(dico, " ! a subckt line!\n");