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

defsubckt(), drop i_ptr, use s instead

This commit is contained in:
rlar 2016-05-08 19:02:34 +02:00
parent 82d4f8544c
commit 948352a2ed
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,32 +507,31 @@ defsubckt(dico_t *dico, struct card *card, nupa_type categ)
to enter subcircuit (categ=U) and model (categ=O) names to enter subcircuit (categ=U) and model (categ=O) names
*/ */
{ {
const char * const s_ = card->line; const char *s = card->line;
int w = card->linenum; int w = card->linenum;
bool err; bool err;
const char *i_ptr, *j_ptr; const char *j_ptr;
i_ptr = s_;
while (*i_ptr && (*i_ptr != '.')) while (*s && (*s != '.'))
i_ptr++; /* skip 1st dotword */ s++; /* skip 1st dotword */
while (*i_ptr && (*i_ptr > ' ')) while (*s && (*s > ' '))
i_ptr++; s++;
while (*i_ptr && (*i_ptr <= ' ')) while (*s && (*s <= ' '))
i_ptr++; /* skip blank */ s++; /* skip blank */
j_ptr = i_ptr; j_ptr = s;
while (*j_ptr && (*j_ptr > ' ')) while (*j_ptr && (*j_ptr > ' '))
j_ptr++; j_ptr++;
if (j_ptr > i_ptr) { if (j_ptr > s) {
SPICE_DSTRING ustr; /* temp user string */ SPICE_DSTRING ustr; /* temp user string */
spice_dstring_init(&ustr); spice_dstring_init(&ustr);
pscopy_up(&ustr, i_ptr, 0, (int) (j_ptr - i_ptr)); pscopy_up(&ustr, s, 0, (int) (j_ptr - s));
err = nupa_define(dico, spice_dstring_value(&ustr), ' ', categ, 0.0, w, NULL); err = nupa_define(dico, spice_dstring_value(&ustr), ' ', categ, 0.0, w, NULL);
spice_dstring_free(&ustr); spice_dstring_free(&ustr);
} else { } else {