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

CKTfndMod(), express error return value outside of this function

This commit is contained in:
rlar 2013-07-17 20:30:46 +02:00
parent 4cc57bdfd6
commit b97c2ba5d1
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/spiceif.c
View File

@ -625,6 +625,7 @@ finddev_special(
// assert(second && *second == -1)
// assert(third && *third == NULL)
err = ft_sim->findModel (ckt, &type, modptr, name);
err = *modptr ? OK : E_NOMOD;
if (err == OK) {
*device_or_model = 1;
return (type);
@ -1225,6 +1226,7 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
// assert(second && *second == -1)
// assert(third && *third == NULL)
err = ft_sim->findModel (ckt, &type, modptr, name);
err = *modptr ? OK : E_NOMOD;
if (err == OK)
return (type);

1
src/spicelib/analysis/cktmcrt.c
View File

@ -26,6 +26,7 @@ CKTmodCrt(CKTcircuit *ckt, int type, GENmodel **modfast, IFuid name)
// assert(second)
// assert(third && *third == NULL)
error = CKTfndMod(ckt, &type, &mymodfast, name);
error = mymodfast ? OK : E_NOMOD;
if(error == E_NOMOD) {
mymodfast = (GENmodel *) tmalloc((size_t) *(DEVices[type]->DEVmodSize));
if(mymodfast == NULL) return(E_NOMEM);

2
src/spicelib/devices/urc/urcsetup.c
View File

@ -311,6 +311,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
// assert(second && *second == -1)
// assert(third && *third == NULL)
error = CKTfndMod(ckt, &type, &modfast, varUid);
error = modfast ? OK : E_NOMOD;
if (error)
return error;
@ -330,6 +331,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
// assert(second && *second == -1)
// assert(third && *third == NULL)
error = CKTfndMod(ckt, &type, &modfast, varUid);
error = modfast ? OK : E_NOMOD;
if (error)
return error;

1
src/tclspice.c
View File

@ -1400,6 +1400,7 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
// assert(second && *second == -1)
// assert(third && *third == NULL)
err = ft_sim->findModel (ft_curckt->ci_ckt, &typecode, &modptr, name);
err = modptr ? OK : E_NOMOD;
} else {
typecode = devptr->GENmodPtr->GENmodType;
err = OK;