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

parser/inpdpar.c, #5/6, cleanup, use a local `IFparm *'

This commit is contained in:
rlar 2018-02-03 17:47:55 +01:00
parent f88cfa5d55
commit cf0c9eac06
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/spicelib/parser/inpdpar.c
View File

@ -35,7 +35,6 @@ INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
int error; /* int to store evaluate error return codes in */ int error; /* int to store evaluate error return codes in */
char *parm = NULL; char *parm = NULL;
char *errbuf; char *errbuf;
int i;
IFvalue *val; IFvalue *val;
char *rtn = NULL; char *rtn = NULL;
@ -59,35 +58,34 @@ INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
goto quit; goto quit;
} }
for (i = 0; i < *(device->numInstanceParms); i++) { IFparm *p = device->instanceParms;
if (strcmp(parm, device->instanceParms[i].keyword) == 0) { IFparm *p_end = p + *(device->numInstanceParms);
for (; p < p_end; p++) {
if (strcmp(parm, p->keyword) == 0) {
break; break;
} }
} }
if (i >= *(device->numInstanceParms)) { if (p >= p_end) {
errbuf = tprintf(" unknown parameter (%s) \n", parm); errbuf = tprintf(" unknown parameter (%s) \n", parm);
rtn = errbuf; rtn = errbuf;
goto quit; goto quit;
} }
val = INPgetValue(ckt, line, val = INPgetValue(ckt, line, p->dataType, tab);
device->instanceParms[i].dataType,
tab);
if (!val) { if (!val) {
rtn = INPerror(E_PARMVAL); rtn = INPerror(E_PARMVAL);
goto quit; goto quit;
} }
error = ft_sim->setInstanceParm (ckt, fast, error = ft_sim->setInstanceParm (ckt, fast, p->id, val, NULL);
device->instanceParms[i].id,
val, NULL);
if (error) { if (error) {
rtn = INPerror(error); rtn = INPerror(error);
goto quit; goto quit;
} }
/* delete the union val */ /* delete the union val */
switch (device->instanceParms[i].dataType & IF_VARTYPES) { switch (p->dataType & IF_VARTYPES) {
case IF_REALVEC: case IF_REALVEC:
tfree(val->v.vec.rVec); tfree(val->v.vec.rVec);
break; break;