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

CKTfndDev(), rewrite invocations where `*fast == NULL'

This commit is contained in:
rlar 2013-07-17 20:28:31 +02:00
parent f375ec6c10
commit 6a9a246526
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/spiceif.c
View File

@ -615,7 +615,7 @@ finddev_special(
int type = -1;
// assert(third && *third == NULL); for all invocations
*devptr = ft_sim->findInstance (ckt, NULL, devptr, name);
*devptr = ft_sim->findInstance (ckt, NULL, NULL, name);
if (*devptr) {
*device_or_model = 0;
return (*devptr)->GENmodPtr->GENmodType;
@ -1217,7 +1217,7 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
int type = -1;
// assert(third && *third == NULL); for all invocations
*devptr = ft_sim->findInstance (ckt, NULL, devptr, name);
*devptr = ft_sim->findInstance (ckt, NULL, NULL, name);
if (*devptr)
return (*devptr)->GENmodPtr->GENmodType;

4
src/spicelib/analysis/noisean.c
View File

@ -49,7 +49,7 @@ NOISEan (CKTcircuit *ckt, int restart)
code = CKTtypelook("Vsource");
if (code != -1) {
// assert(third && *third == NULL);
inst = CKTfndDev(ckt, NULL, &inst, job->input);
inst = CKTfndDev(ckt, NULL, NULL, job->input);
if (inst && !((VSRCinstance *)inst)->VSRCacGiven) {
errMsg = TMALLOC(char, strlen(noacinput) + 1);
strcpy(errMsg,noacinput);
@ -60,7 +60,7 @@ NOISEan (CKTcircuit *ckt, int restart)
code = CKTtypelook("Isource");
if (code != -1 && inst==NULL) {
// assert(third && *third == NULL);
inst = CKTfndDev(ckt, NULL, &inst, job->input);
inst = CKTfndDev(ckt, NULL, NULL, job->input);
if (!inst) {
/* XXX ??? */
SPfrontEnd->IFerror (ERR_WARNING,

4
src/spicelib/analysis/tfanal.c
View File

@ -52,7 +52,7 @@ TFanal(CKTcircuit *ckt, int restart)
Vtype = CKTtypelook("Vsource");
if(Itype != -1) {
// assert(third && *third == NULL);
ptr = CKTfndDev(ckt, NULL, &ptr, job->TFinSrc);
ptr = CKTfndDev(ckt, NULL, NULL, job->TFinSrc);
if (ptr) {
job->TFinIsI = 1;
job->TFinIsV = 0;
@ -63,7 +63,7 @@ TFanal(CKTcircuit *ckt, int restart)
if( (Vtype != -1) && (ptr==NULL) ) {
// assert(third && *third == NULL);
ptr = CKTfndDev(ckt, NULL, &ptr, job->TFinSrc);
ptr = CKTfndDev(ckt, NULL, NULL, job->TFinSrc);
job->TFinIsV = 1;
job->TFinIsI = 0;
if (!ptr) {

2
src/spicelib/devices/cktcrte.c
View File

@ -29,7 +29,7 @@ CKTcrtElt(CKTcircuit *ckt, GENmodel *modPtr, GENinstance **inInstPtr, IFuid name
return E_NOMOD;
// assert(third && *third == NULL);
instPtr = CKTfndDev(ckt, NULL, &instPtr, name);
instPtr = CKTfndDev(ckt, NULL, NULL, name);
if (instPtr) {
if (inInstPtr)

2
src/tclspice.c
View File

@ -1395,7 +1395,7 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
/* get the unique IFuid for name (device/model) */
INPretrieve(&name, ft_curckt->ci_symtab);
// assert(third && *third == NULL);
devptr = ft_sim->findInstance (ft_curckt->ci_ckt, NULL, &devptr, name);
devptr = ft_sim->findInstance (ft_curckt->ci_ckt, NULL, NULL, name);
if (!devptr) {
typecode = -1;
devptr = NULL;

2
src/unsupported/snstart.c
View File

@ -43,7 +43,7 @@ SENstartup(CKTcircuit *ckt, int restart)
fast = NULL;
// assert(third && *third == NULL);
fast = CKTfndDev(ckt, NULL, &fast, ckt->CKTsenInfo->SENdevices[i]);
fast = CKTfndDev(ckt, NULL, NULL, ckt->CKTsenInfo->SENdevices[i]);
if (!fast)
return E_NODEV;