diff --git a/ChangeLog b/ChangeLog index c8d9c08a2..b6908e540 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,73 @@ +2010-08-10 Robert Larice + * src/frontend/spiceif.c , + * src/spicelib/analysis/acan.c , + * src/spicelib/analysis/cktnoise.c , + * src/spicelib/analysis/dctran.c , + * src/spicelib/analysis/dctrcurv.c , + * src/spicelib/analysis/distoan.c , + * src/spicelib/analysis/noisean.c , + * src/spicelib/analysis/pzan.c , + * src/spicelib/analysis/tfanal.c , + * src/spicelib/devices/bjt/bjtnoise.c , + * src/spicelib/devices/bjt2/bjt2noise.c , + * src/spicelib/devices/bsim1/b1noi.c , + * src/spicelib/devices/bsim2/b2noi.c , + * src/spicelib/devices/bsim3/b3noi.c , + * src/spicelib/devices/bsim3soi/b4soinoi.c , + * src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c , + * src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c , + * src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c , + * src/spicelib/devices/bsim3v0/b3v0noi.c , + * src/spicelib/devices/bsim3v1/b3v1noi.c , + * src/spicelib/devices/bsim3v1a/b3v1anoi.c , + * src/spicelib/devices/bsim3v1s/b3v1snoi.c , + * src/spicelib/devices/bsim3v32/b3v32noi.c , + * src/spicelib/devices/bsim4/b4noi.c , + * src/spicelib/devices/bsim4v2/b4v2noi.c , + * src/spicelib/devices/bsim4v3/b4v3noi.c , + * src/spicelib/devices/bsim4v4/b4v4noi.c , + * src/spicelib/devices/bsim4v5/b4v5noi.c , + * src/spicelib/devices/csw/cswnoise.c , + * src/spicelib/devices/dio/dionoise.c , + * src/spicelib/devices/hisim/hsm1noi.c , + * src/spicelib/devices/jfet/jfetnoi.c , + * src/spicelib/devices/jfet2/jfet2noi.c , + * src/spicelib/devices/mes/mesnoise.c , + * src/spicelib/devices/mos1/mos1noi.c , + * src/spicelib/devices/mos2/mos2noi.c , + * src/spicelib/devices/mos3/mos3noi.c , + * src/spicelib/devices/mos9/mos9noi.c , + * src/spicelib/devices/res/resnoise.c , + * src/spicelib/devices/soi3/soi3nois.c , + * src/spicelib/devices/sw/swnoise.c , + * src/spicelib/devices/urc/urcsetup.c , + * src/spicelib/devices/vbic/vbicnoise.c , + * src/spicelib/parser/inp2b.c , + * src/spicelib/parser/inp2c.c , + * src/spicelib/parser/inp2d.c , + * src/spicelib/parser/inp2e.c , + * src/spicelib/parser/inp2f.c , + * src/spicelib/parser/inp2g.c , + * src/spicelib/parser/inp2h.c , + * src/spicelib/parser/inp2i.c , + * src/spicelib/parser/inp2j.c , + * src/spicelib/parser/inp2k.c , + * src/spicelib/parser/inp2l.c , + * src/spicelib/parser/inp2m.c , + * src/spicelib/parser/inp2o.c , + * src/spicelib/parser/inp2p.c , + * src/spicelib/parser/inp2q.c , + * src/spicelib/parser/inp2r.c , + * src/spicelib/parser/inp2s.c , + * src/spicelib/parser/inp2t.c , + * src/spicelib/parser/inp2u.c , + * src/spicelib/parser/inp2v.c , + * src/spicelib/parser/inp2w.c , + * src/spicelib/parser/inp2y.c , + * src/spicelib/parser/inp2z.c : + drop a bunch of (void**) NULL casts, + all in the sixth argument of IFnewUid() + 2010-08-10 Robert Larice * src/include/cktdefs.h , * src/include/ifsim.h , diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 5c37ca493..cb890d773 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -109,7 +109,7 @@ if_inpdeck(struct line *deck, INPtables **tab) /*CDHW Create a task DDD with a new UID. ci_defTask will point to it CDHW*/ - err = IFnewUid(ckt,&taskUid,(IFuid)NULL,"default",UID_TASK,(void**)NULL); + err = IFnewUid(ckt, &taskUid, (IFuid)NULL, "default", UID_TASK, NULL); if(err) { ft_sperror(err,"newUid"); return(NULL); @@ -138,7 +138,7 @@ if_inpdeck(struct line *deck, INPtables **tab) if(which != -1) { err = IFnewUid(ckt,&optUid,(IFuid)NULL,"options",UID_ANALYSIS, - (void**)NULL); + NULL); if(err) { ft_sperror(err,"newUid"); return(NULL); @@ -246,7 +246,7 @@ if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab) ci_specTask will point to it CDHW*/ err = IFnewUid(ft_curckt->ci_ckt,&specUid,(IFuid)NULL,"special", - UID_TASK,(void**)NULL); + UID_TASK,NULL); if(err) { ft_sperror(err,"newUid"); return(2); @@ -274,7 +274,7 @@ ci_specTask will point to it CDHW*/ } if(which != -1) { /*CDHW options are available CDHW*/ err = IFnewUid(ft_curckt->ci_ckt,&optUid,(IFuid)NULL,"options", - UID_ANALYSIS,(void**)NULL); + UID_ANALYSIS,NULL); if(err) { ft_sperror(err,"newUid"); return(2); @@ -1210,7 +1210,7 @@ if_tranparams(struct circ *ci, double *start, double *stop, double *step) if(which == -1) return(FALSE); err = IFnewUid(ci->ci_ckt,&tranUid,(IFuid)NULL,"Transient Analysis", - UID_ANALYSIS, (void**)NULL); + UID_ANALYSIS, NULL); if(err != OK) return(FALSE); err =(*(ft_sim->findAnalysis))(ci->ci_ckt,&which, &anal,tranUid, ci->ci_curTask,(IFuid )NULL); @@ -1529,7 +1529,7 @@ do {\ return; } (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, - "time", UID_OTHER, (void **)NULL); + "time", UID_OTHER, NULL); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList, diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index 79b850396..9997110c2 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -162,7 +162,7 @@ ACan(CKTcircuit *ckt, int restart) } (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList, diff --git a/src/spicelib/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c index e947ece89..9ca6328f6 100644 --- a/src/spicelib/analysis/cktnoise.c +++ b/src/spicelib/analysis/cktnoise.c @@ -55,13 +55,13 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) (data->numPlots + 1)*sizeof(IFuid)); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,"onoise_spectrum",UID_OTHER,(void **)NULL); + (IFuid)NULL, "onoise_spectrum", UID_OTHER, NULL); data->namelist = (IFuid *)trealloc((char *)data->namelist, (data->numPlots + 1)*sizeof(IFuid)); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,"inoise_spectrum",UID_OTHER,(void **)NULL); + (IFuid)NULL, "inoise_spectrum", UID_OTHER, NULL); /* we've added two more plots */ @@ -74,12 +74,12 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) data->namelist = (IFuid *)trealloc((char *)data->namelist, (data->numPlots + 1)*sizeof(IFuid)); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,"onoise_total",UID_OTHER,(void **)NULL); + (IFuid)NULL, "onoise_total", UID_OTHER, NULL); data->namelist = (IFuid *)trealloc((char *)data->namelist, (data->numPlots + 1)*sizeof(IFuid)); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,"inoise_total",UID_OTHER,(void **)NULL); + (IFuid)NULL, "inoise_total", UID_OTHER, NULL); /* we've added two more plots */ data->outpVector = diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index 0bd73f1e8..d883f2111 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -139,7 +139,7 @@ DCtran(CKTcircuit *ckt, error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, - "time", UID_OTHER, (void **)NULL); + "time", UID_OTHER, NULL); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList, @@ -332,7 +332,7 @@ DCtran(CKTcircuit *ckt, if(error) return(error); /* get timeUiD again */ (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, - "time", UID_OTHER, (void **)NULL); + "time", UID_OTHER, NULL); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,666,nameList, 666,&(((TRANan*)ckt->CKTcurJob)->TRANplot));/*magic 666 nums as flags */ diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index 91b7f591c..c0bee3ceb 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -191,26 +191,26 @@ found:; if (cv->TRCVvType[i]==vcode) (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, - "v-sweep", UID_OTHER, (void **)NULL); + "v-sweep", UID_OTHER, NULL); else { if (cv->TRCVvType[i]==icode) (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, - "i-sweep", UID_OTHER, (void **)NULL); + "i-sweep", UID_OTHER, NULL); else { if (cv->TRCVvType[i]==TEMP_CODE) (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, - "temp-sweep", UID_OTHER, (void **)NULL); + "temp-sweep", UID_OTHER, NULL); else { if (cv->TRCVvType[i]==rcode) (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, - "res-sweep", UID_OTHER, (void **)NULL); + "res-sweep", UID_OTHER, NULL); else (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, - "?-sweep", UID_OTHER, (void **)NULL); + "?-sweep", UID_OTHER, NULL); } /* icode */ } /* TEMP_CODE */ } /* rcode*/ diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c index 4dc4dec27..db0a78976 100644 --- a/src/spicelib/analysis/distoan.c +++ b/src/spicelib/analysis/distoan.c @@ -521,7 +521,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob,"DISTORTION - 2nd harmonic", freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); @@ -545,7 +545,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob,"DISTORTION - 3rd harmonic",freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); @@ -567,7 +567,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob,"DISTORTION - IM: f1+f2",freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); @@ -587,7 +587,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob,"DISTORTION - IM: f1-f2",freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); @@ -608,7 +608,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob,"DISTORTION - IM: 2f1-f2",freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index af6755642..e63f80ac5 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -123,7 +123,7 @@ NOISEan (CKTcircuit *ckt, int restart) declared before an OUTpBeginplot */ (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, - "frequency", UID_OTHER,(void **)NULL); + "frequency", UID_OTHER, NULL); data->numPlots = 0; /* we don't have any plots yet */ error = CKTnoise(ckt,N_DENS,N_OPEN,data); diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c index e854af9e2..1bf399286 100644 --- a/src/spicelib/analysis/pzan.c +++ b/src/spicelib/analysis/pzan.c @@ -139,12 +139,12 @@ PZpost(CKTcircuit *ckt) for (i = 0; i < pzan->PZnPoles; i++) { sprintf(name, "pole(%-u)", i+1); (*(SPfrontEnd->IFnewUid))(ckt,&(namelist[j++]),(IFuid)NULL, - name,UID_OTHER,(void **)NULL); + name, UID_OTHER, NULL); } for (i = 0; i < pzan->PZnZeros; i++) { sprintf(name, "zero(%-u)", i+1); (*(SPfrontEnd->IFnewUid))(ckt,&(namelist[j++]),(IFuid)NULL, - name,UID_OTHER,(void **)NULL); + name, UID_OTHER, NULL); } (*SPfrontEnd->OUTpBeginPlot)(ckt, (void *)pzan, pzan->JOBname, diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c index 1a772d51d..5d6a0bb96 100644 --- a/src/spicelib/analysis/tfanal.c +++ b/src/spicelib/analysis/tfanal.c @@ -92,23 +92,23 @@ TFanal(CKTcircuit *ckt, int restart) /* make a UID for the transfer function output */ (*(SPfrontEnd->IFnewUid))(ckt,&tfuid,(IFuid)NULL,"Transfer_function", - UID_OTHER,(void **)NULL); + UID_OTHER, NULL); /* make a UID for the input impedance */ (*(SPfrontEnd->IFnewUid))(ckt,&inuid,((TFan*)ckt->CKTcurJob)->TFinSrc, - "Input_impedance", UID_OTHER,(void **)NULL); + "Input_impedance", UID_OTHER, NULL); /* make a UID for the output impedance */ if(((TFan*)ckt->CKTcurJob)->TFoutIsI) { (*(SPfrontEnd->IFnewUid))(ckt,&outuid,((TFan*)ckt->CKTcurJob)->TFoutSrc - ,"Output_impedance", UID_OTHER,(void **)NULL); + ,"Output_impedance", UID_OTHER, NULL); } else { name = (char *) MALLOC(sizeof(char)*(strlen(((TFan*)ckt->CKTcurJob)->TFoutName)+22)); (void)sprintf(name,"output_impedance_at_%s", ((TFan*)ckt->CKTcurJob)->TFoutName); (*(SPfrontEnd->IFnewUid))(ckt,&outuid,(IFuid)NULL, - name, UID_OTHER,(void **)NULL); + name, UID_OTHER, NULL); } error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,(void *)(ckt->CKTcurJob), diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c index e7dce99f7..3fd9ec57b 100644 --- a/src/spicelib/devices/bjt/bjtnoise.c +++ b/src/spicelib/devices/bjt/bjtnoise.c @@ -78,7 +78,7 @@ BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; @@ -94,7 +94,7 @@ BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ (void)sprintf(name,"inoise_total_%s%s", @@ -104,7 +104,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bjt2/bjt2noise.c b/src/spicelib/devices/bjt2/bjt2noise.c index 291ba6de6..51f633fa5 100644 --- a/src/spicelib/devices/bjt2/bjt2noise.c +++ b/src/spicelib/devices/bjt2/bjt2noise.c @@ -76,7 +76,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; @@ -92,7 +92,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ (void)sprintf(name,"inoise_total_%s%s", @@ -102,7 +102,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim1/b1noi.c b/src/spicelib/devices/bsim1/b1noi.c index 77172a835..f4a9584fa 100644 --- a/src/spicelib/devices/bsim1/b1noi.c +++ b/src/spicelib/devices/bsim1/b1noi.c @@ -69,7 +69,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -85,7 +85,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -96,7 +96,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/bsim2/b2noi.c b/src/spicelib/devices/bsim2/b2noi.c index f3d6458a4..6c374afe6 100644 --- a/src/spicelib/devices/bsim2/b2noi.c +++ b/src/spicelib/devices/bsim2/b2noi.c @@ -69,7 +69,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -85,7 +85,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -96,7 +96,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c index 7cf3d93a8..0b2bbe6c6 100644 --- a/src/spicelib/devices/bsim3/b3noi.c +++ b/src/spicelib/devices/bsim3/b3noi.c @@ -165,7 +165,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -183,7 +183,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -198,7 +198,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c index 36a2adced..0c100e764 100644 --- a/src/spicelib/devices/bsim3soi/b4soinoi.c +++ b/src/spicelib/devices/bsim3soi/b4soinoi.c @@ -174,7 +174,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -192,7 +192,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -207,7 +207,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c index 249713b83..023707c6e 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c @@ -158,7 +158,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -176,7 +176,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -191,7 +191,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c index b1f31fa8c..8a3aedc72 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c @@ -158,7 +158,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -176,7 +176,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -191,7 +191,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c index 060391183..d4aef7159 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c @@ -160,7 +160,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -178,7 +178,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -193,7 +193,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c index 44768667e..43b3a57c0 100644 --- a/src/spicelib/devices/bsim3v0/b3v0noi.c +++ b/src/spicelib/devices/bsim3v0/b3v0noi.c @@ -132,7 +132,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -150,7 +150,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -165,7 +165,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c index 0ffb7bdaf..76f3b3a13 100644 --- a/src/spicelib/devices/bsim3v1/b3v1noi.c +++ b/src/spicelib/devices/bsim3v1/b3v1noi.c @@ -154,7 +154,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -172,7 +172,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -187,7 +187,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3v1a/b3v1anoi.c b/src/spicelib/devices/bsim3v1a/b3v1anoi.c index 3ca618e2d..d9137417a 100644 --- a/src/spicelib/devices/bsim3v1a/b3v1anoi.c +++ b/src/spicelib/devices/bsim3v1a/b3v1anoi.c @@ -133,7 +133,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -151,7 +151,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -166,7 +166,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3v1s/b3v1snoi.c b/src/spicelib/devices/bsim3v1s/b3v1snoi.c index eca5f9e3b..7d25eb051 100644 --- a/src/spicelib/devices/bsim3v1s/b3v1snoi.c +++ b/src/spicelib/devices/bsim3v1s/b3v1snoi.c @@ -145,7 +145,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -163,7 +163,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -178,7 +178,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim3v32/b3v32noi.c b/src/spicelib/devices/bsim3v32/b3v32noi.c index 369e4cd5b..d5ad6572c 100644 --- a/src/spicelib/devices/bsim3v32/b3v32noi.c +++ b/src/spicelib/devices/bsim3v32/b3v32noi.c @@ -234,7 +234,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -252,7 +252,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -267,7 +267,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c index ff1866d90..f384892bf 100644 --- a/src/spicelib/devices/bsim4/b4noi.c +++ b/src/spicelib/devices/bsim4/b4noi.c @@ -147,7 +147,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -165,7 +165,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -180,7 +180,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim4v2/b4v2noi.c b/src/spicelib/devices/bsim4v2/b4v2noi.c index 99cc86906..4f1d2da06 100644 --- a/src/spicelib/devices/bsim4v2/b4v2noi.c +++ b/src/spicelib/devices/bsim4v2/b4v2noi.c @@ -141,7 +141,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -159,7 +159,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -174,7 +174,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim4v3/b4v3noi.c b/src/spicelib/devices/bsim4v3/b4v3noi.c index 46bac0fc7..60249abc9 100644 --- a/src/spicelib/devices/bsim4v3/b4v3noi.c +++ b/src/spicelib/devices/bsim4v3/b4v3noi.c @@ -143,7 +143,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -161,7 +161,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -176,7 +176,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim4v4/b4v4noi.c b/src/spicelib/devices/bsim4v4/b4v4noi.c index b3ab3bd16..addb65d47 100644 --- a/src/spicelib/devices/bsim4v4/b4v4noi.c +++ b/src/spicelib/devices/bsim4v4/b4v4noi.c @@ -144,7 +144,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -162,7 +162,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -177,7 +177,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/bsim4v5/b4v5noi.c b/src/spicelib/devices/bsim4v5/b4v5noi.c index 646593c94..f6d2e369f 100644 --- a/src/spicelib/devices/bsim4v5/b4v5noi.c +++ b/src/spicelib/devices/bsim4v5/b4v5noi.c @@ -146,7 +146,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ } break; @@ -164,7 +164,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **) NULL); + NULL); /* we've added one more plot */ (void) sprintf(name, "inoise_total.%s%s", @@ -179,7 +179,7 @@ int i; (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, - (void **)NULL); + NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c index 219cee655..3de082b71 100644 --- a/src/spicelib/devices/csw/cswnoise.c +++ b/src/spicelib/devices/csw/cswnoise.c @@ -59,7 +59,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid) NULL, name, UID_OTHER, NULL); /* we've added one more plot */ break; @@ -71,7 +71,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ (void)sprintf(name,"inoise_total_%s",inst->CSWname); @@ -81,7 +81,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ break; diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c index bb938ee29..fb4628d47 100644 --- a/src/spicelib/devices/dio/dionoise.c +++ b/src/spicelib/devices/dio/dionoise.c @@ -68,7 +68,7 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*sizeof(IFuid)); if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } @@ -81,7 +81,7 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*sizeof(IFuid)); if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ (void)sprintf(name,"inoise_total_%s%s",inst->DIOname,DIOnNames[i]); @@ -89,7 +89,7 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*sizeof(IFuid)); if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } diff --git a/src/spicelib/devices/hisim/hsm1noi.c b/src/spicelib/devices/hisim/hsm1noi.c index fbcf50598..b23cbf8eb 100644 --- a/src/spicelib/devices/hisim/hsm1noi.c +++ b/src/spicelib/devices/hisim/hsm1noi.c @@ -99,7 +99,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, return(E_NOMEM); (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, (void **) NULL); + (IFuid) NULL, name, UID_OTHER, NULL); } break; case INT_NOIZ: @@ -113,7 +113,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, return(E_NOMEM); (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, (void **) NULL); + (IFuid) NULL, name, UID_OTHER, NULL); (void) sprintf(name, "inoise_total.%s%s", (char *)here->HSM1name, HSM1nNames[i]); @@ -124,7 +124,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, return(E_NOMEM); (*(SPfrontEnd->IFnewUid)) (ckt, &(data->namelist[data->numPlots++]), - (IFuid) NULL, name, UID_OTHER, (void **)NULL); + (IFuid) NULL, name, UID_OTHER, NULL); } break; } diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c index 8408d2e3a..d4f112f42 100644 --- a/src/spicelib/devices/jfet/jfetnoi.c +++ b/src/spicelib/devices/jfet/jfetnoi.c @@ -69,7 +69,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -85,7 +85,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -96,7 +96,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c index 0744df36d..c7a9b6702 100644 --- a/src/spicelib/devices/jfet2/jfet2noi.c +++ b/src/spicelib/devices/jfet2/jfet2noi.c @@ -74,7 +74,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -90,7 +90,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -101,7 +101,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c index 16090bfd3..7eb2ae692 100644 --- a/src/spicelib/devices/mes/mesnoise.c +++ b/src/spicelib/devices/mes/mesnoise.c @@ -69,7 +69,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -85,7 +85,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -100,7 +100,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c index bf4eb413a..5615b7afc 100644 --- a/src/spicelib/devices/mos1/mos1noi.c +++ b/src/spicelib/devices/mos1/mos1noi.c @@ -80,7 +80,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -96,7 +96,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -107,7 +107,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c index b571f57b3..eb25c20e2 100644 --- a/src/spicelib/devices/mos2/mos2noi.c +++ b/src/spicelib/devices/mos2/mos2noi.c @@ -70,7 +70,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -86,7 +86,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -97,7 +97,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c index 5d83fb0c9..504a53470 100644 --- a/src/spicelib/devices/mos3/mos3noi.c +++ b/src/spicelib/devices/mos3/mos3noi.c @@ -70,7 +70,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -86,7 +86,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -97,7 +97,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos9/mos9noi.c b/src/spicelib/devices/mos9/mos9noi.c index f7aee0826..17cb7b82d 100644 --- a/src/spicelib/devices/mos9/mos9noi.c +++ b/src/spicelib/devices/mos9/mos9noi.c @@ -70,7 +70,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -86,7 +86,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -97,7 +97,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c index 13285739b..583e725fc 100644 --- a/src/spicelib/devices/res/resnoise.c +++ b/src/spicelib/devices/res/resnoise.c @@ -85,7 +85,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; @@ -102,7 +102,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -116,7 +116,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } diff --git a/src/spicelib/devices/soi3/soi3nois.c b/src/spicelib/devices/soi3/soi3nois.c index fa01bc7ff..2123b0c0c 100644 --- a/src/spicelib/devices/soi3/soi3nois.c +++ b/src/spicelib/devices/soi3/soi3nois.c @@ -96,7 +96,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -112,7 +112,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ (void)sprintf(name,"inoise_total_%s%s",inst->SOI3name,SOI3nNames[i]); @@ -122,7 +122,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c index 5a75cbab3..b8c037f76 100644 --- a/src/spicelib/devices/sw/swnoise.c +++ b/src/spicelib/devices/sw/swnoise.c @@ -59,7 +59,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -73,7 +73,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -84,7 +84,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c index 9d0e1dc96..4f61b6f80 100644 --- a/src/spicelib/devices/urc/urcsetup.c +++ b/src/spicelib/devices/urc/urcsetup.c @@ -93,7 +93,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if(model->URCisPerLGiven) { error = (*(SPfrontEnd->IFnewUid))(ckt,&dioUid,here->URCname, - "diodemod",UID_MODEL,(void **)NULL); + "diodemod", UID_MODEL, NULL); if(error) return(error); modfast = (GENmodel *)NULL; error = CKTmodCrt(ckt,dtype,&modfast, @@ -110,7 +110,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if(error) return(error); } else { error = (*(SPfrontEnd->IFnewUid))(ckt,&capUid, - here->URCname, "capmod",UID_MODEL,(void **)NULL); + here->URCname, "capmod", UID_MODEL, NULL); if(error) return(error); modfast = (GENmodel *)NULL; error = CKTmodCrt(ckt,ctype,&modfast, @@ -119,7 +119,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) } error = (*(SPfrontEnd->IFnewUid))(ckt,&resUid,here->URCname, - "resmod",UID_MODEL,(void **)NULL); + "resmod", UID_MODEL, NULL); if(error) return(error); rmodfast = (GENmodel *)NULL; error = CKTmodCrt(ckt,rtype,&rmodfast,resUid); @@ -148,7 +148,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) nameelt = (char *)MALLOC(10*sizeof(char)); (void)sprintf(nameelt,"rlo%d",i); error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid,here->URCname, - nameelt,UID_INSTANCE, (void **)NULL); + nameelt, UID_INSTANCE, NULL); if(error) return(error); error = CKTcrtElt(ckt,rmodfast, &fast,eltUid); @@ -165,7 +165,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) nameelt = (char *)MALLOC(10*sizeof(char)); (void)sprintf(nameelt,"rhi%d",i); error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid,here->URCname, - nameelt,UID_INSTANCE, (void **)NULL); + nameelt, UID_INSTANCE, NULL); if(error) return(error); error = CKTcrtElt(ckt,rmodfast, &fast,eltUid); @@ -185,7 +185,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (void)sprintf(nameelt,"dlo%d",i); error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid, here->URCname,nameelt,UID_INSTANCE, - (void **)NULL); + NULL); if(error) return(error); error = CKTcrtElt(ckt,modfast, &fast, eltUid); @@ -204,7 +204,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) nameelt = (char *)MALLOC(10*sizeof(char)); (void)sprintf(nameelt,"clo%d",i); error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid,here->URCname - ,nameelt,UID_INSTANCE, (void **)NULL); + ,nameelt, UID_INSTANCE, NULL); if(error) return(error); error = CKTcrtElt(ckt,modfast, &fast, eltUid); @@ -228,7 +228,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (void)sprintf(nameelt,"dhi%d",i); error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid, here->URCname,nameelt,UID_INSTANCE, - (void **)NULL); + NULL); if(error) return(error); error = CKTcrtElt(ckt,modfast, &fast,eltUid); @@ -248,7 +248,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (void)sprintf(nameelt,"chi%d",i); error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid, here->URCname,nameelt,UID_INSTANCE, - (void **)NULL); + NULL); if(error) return(error); error = CKTcrtElt(ckt,modfast, &fast,eltUid); @@ -297,14 +297,14 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt) here->URCname, "diodemod", UID_MODEL, - (void **)NULL); + NULL); } else { /* Capacitors */ error = (*(SPfrontEnd->IFnewUid))(ckt, &varUid, here->URCname, "capmod", UID_MODEL, - (void **)NULL); + NULL); } if (error && error != E_EXISTS) return error; @@ -322,7 +322,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt) /* Resistors */ error = (*(SPfrontEnd->IFnewUid))(ckt,&varUid,here->URCname, - "resmod",UID_MODEL,(void **)NULL); + "resmod", UID_MODEL, NULL); if (error && error != E_EXISTS) return error; diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c index 8e1462dea..77619bbcf 100644 --- a/src/spicelib/devices/vbic/vbicnoise.c +++ b/src/spicelib/devices/vbic/vbicnoise.c @@ -87,7 +87,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; @@ -103,7 +103,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ (void)sprintf(name,"inoise_total_%s%s", @@ -113,7 +113,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s if (!data->namelist) return(E_NOMEM); (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), - (IFuid)NULL,name,UID_OTHER,(void **)NULL); + (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ } break; diff --git a/src/spicelib/parser/inp2b.c b/src/spicelib/parser/inp2b.c index 3230d5c35..29a63439a 100644 --- a/src/spicelib/parser/inp2b.c +++ b/src/spicelib/parser/inp2b.c @@ -55,7 +55,7 @@ void INP2B(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defBmod) { /* create default B model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "B", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "B", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defBmod), uid)); } IFC(newInstance, (ckt, tab->defBmod, &fast, name)); diff --git a/src/spicelib/parser/inp2c.c b/src/spicelib/parser/inp2c.c index a7725f022..50017e08c 100644 --- a/src/spicelib/parser/inp2c.c +++ b/src/spicelib/parser/inp2c.c @@ -81,7 +81,7 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, card * current) type = mytype; if (!tab->defCmod) { /* create default C model */ IFnewUid(ckt, &uid, (IFuid) NULL, "C", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defCmod), uid)); } mdfast = tab->defCmod; @@ -94,7 +94,7 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defCmod) { /* create default C model */ IFnewUid(ckt, &uid, (IFuid) NULL, "C", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defCmod), uid)); } IFC(newInstance, (ckt, tab->defCmod, &fast, name)); diff --git a/src/spicelib/parser/inp2d.c b/src/spicelib/parser/inp2d.c index d10a77238..53fe8fbee 100644 --- a/src/spicelib/parser/inp2d.c +++ b/src/spicelib/parser/inp2d.c @@ -68,7 +68,7 @@ void INP2D(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defDmod) { /* create default D model */ IFnewUid(ckt, &uid, (IFuid) NULL, "D", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defDmod), uid)); } mdfast = tab->defDmod; diff --git a/src/spicelib/parser/inp2e.c b/src/spicelib/parser/inp2e.c index 93abef03f..837f83b59 100644 --- a/src/spicelib/parser/inp2e.c +++ b/src/spicelib/parser/inp2e.c @@ -52,7 +52,7 @@ void INP2E(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname4, tab, &node4); if (!tab->defEmod) { /* create default E model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "E", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "E", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defEmod), uid)); } IFC(newInstance, (ckt, tab->defEmod, &fast, name)); diff --git a/src/spicelib/parser/inp2f.c b/src/spicelib/parser/inp2f.c index 4b6d1d32b..023ce0a34 100644 --- a/src/spicelib/parser/inp2f.c +++ b/src/spicelib/parser/inp2f.c @@ -45,7 +45,7 @@ void INP2F(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname2, tab, &node2); if (!tab->defFmod) { /* create default F model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "F", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "F", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defFmod), uid)); } diff --git a/src/spicelib/parser/inp2g.c b/src/spicelib/parser/inp2g.c index 696f03864..bdade3501 100644 --- a/src/spicelib/parser/inp2g.c +++ b/src/spicelib/parser/inp2g.c @@ -52,7 +52,7 @@ void INP2G(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname4, tab, &node4); if (!tab->defGmod) { /* create default G model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "G", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "G", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defGmod), uid)); } IFC(newInstance, (ckt, tab->defGmod, &fast, name)); diff --git a/src/spicelib/parser/inp2h.c b/src/spicelib/parser/inp2h.c index 69e386120..c7be88e17 100644 --- a/src/spicelib/parser/inp2h.c +++ b/src/spicelib/parser/inp2h.c @@ -45,7 +45,7 @@ void INP2H(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname2, tab, &node2); if (!tab->defHmod) { /* create default H model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "H", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "H", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defHmod), uid)); } IFC(newInstance, (ckt, tab->defHmod, &fast, name)); diff --git a/src/spicelib/parser/inp2i.c b/src/spicelib/parser/inp2i.c index f0d61219e..b9e27a0cf 100644 --- a/src/spicelib/parser/inp2i.c +++ b/src/spicelib/parser/inp2i.c @@ -45,7 +45,7 @@ void INP2I(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname2, tab, &node2); if (!tab->defImod) { /* create default I model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "I", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "I", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defImod), uid)); } IFC(newInstance, (ckt, tab->defImod, &fast, name)); diff --git a/src/spicelib/parser/inp2j.c b/src/spicelib/parser/inp2j.c index 7e382c72a..04b8f6a09 100644 --- a/src/spicelib/parser/inp2j.c +++ b/src/spicelib/parser/inp2j.c @@ -66,7 +66,7 @@ void INP2J(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defJmod) { /* create default J model */ IFnewUid(ckt, &uid, (IFuid) NULL, "J", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defJmod), uid)); } mdfast = tab->defJmod; diff --git a/src/spicelib/parser/inp2k.c b/src/spicelib/parser/inp2k.c index 33f006d2c..ca6c7ef2d 100644 --- a/src/spicelib/parser/inp2k.c +++ b/src/spicelib/parser/inp2k.c @@ -37,7 +37,7 @@ void INP2K(CKTcircuit *ckt, INPtables * tab, card * current) INPinsert(&name, tab); if (!tab->defKmod) { /* create deafult K model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "K", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "K", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defKmod), uid)); } IFC(newInstance, (ckt, tab->defKmod, &fast, name)); diff --git a/src/spicelib/parser/inp2l.c b/src/spicelib/parser/inp2l.c index f2323817b..79ce44ba7 100644 --- a/src/spicelib/parser/inp2l.c +++ b/src/spicelib/parser/inp2l.c @@ -81,7 +81,7 @@ void INP2L(CKTcircuit *ckt, INPtables * tab, card * current) type = mytype; if (!tab->defLmod) { /* create default L model */ IFnewUid(ckt, &uid, (IFuid) NULL, "L", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defLmod), uid)); } mdfast = tab->defLmod; @@ -94,7 +94,7 @@ void INP2L(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defLmod) { /* create default L model */ IFnewUid(ckt, &uid, (IFuid) NULL, "L", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defLmod), uid)); } IFC(newInstance, (ckt, tab->defLmod, &fast, name)); diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c index fe2997ec4..8301aecda 100644 --- a/src/spicelib/parser/inp2m.c +++ b/src/spicelib/parser/inp2m.c @@ -252,7 +252,7 @@ INP2M (CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defMmod) { /* create default M model */ - IFnewUid (ckt, &uid, (IFuid) NULL, "M", UID_MODEL, (void **) NULL); + IFnewUid (ckt, &uid, (IFuid) NULL, "M", UID_MODEL, NULL); IFC (newModel, (ckt, type, &(tab->defMmod), uid)); } mdfast = tab->defMmod; diff --git a/src/spicelib/parser/inp2o.c b/src/spicelib/parser/inp2o.c index 56e6ea03a..6a3b9e75f 100644 --- a/src/spicelib/parser/inp2o.c +++ b/src/spicelib/parser/inp2o.c @@ -77,7 +77,7 @@ void INP2O(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defOmod) { /* create default O model */ IFnewUid(ckt, &uid, (IFuid) NULL, "O", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defOmod), uid)); } mdfast = tab->defOmod; diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c index 927d10147..e76d4badf 100644 --- a/src/spicelib/parser/inp2p.c +++ b/src/spicelib/parser/inp2p.c @@ -96,7 +96,7 @@ int num, i; type = mytype; if(!tab->defPmod) { /* create default P model */ - IFnewUid(ckt,&uid,(IFuid)NULL,"P",UID_MODEL,(void**)NULL); + IFnewUid(ckt, &uid, (IFuid)NULL, "P", UID_MODEL, NULL); IFC(newModel, (ckt,type,&(tab->defPmod),uid)) } mdfast = tab->defPmod; diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c index 2ee710d51..59a7858c4 100644 --- a/src/spicelib/parser/inp2q.c +++ b/src/spicelib/parser/inp2q.c @@ -158,7 +158,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, void *gnode) if (!tab->defQmod) { /* create default Q model */ char *err; - IFnewUid(ckt, &uid, (IFuid) NULL, "Q", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "Q", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defQmod), uid)); err = (char *) MALLOC((70 + strlen(model)) * sizeof(char)); (void) sprintf(err, "Unable to find definition of model %s - default BJT assumed \n", model); diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c index 23c4cdb00..e1b484d3a 100644 --- a/src/spicelib/parser/inp2r.c +++ b/src/spicelib/parser/inp2r.c @@ -184,7 +184,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, card * current) type = mytype; if (!tab->defRmod) { /* create default R model */ IFnewUid(ckt, &uid, (IFuid) NULL, "R", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defRmod), uid)); } mdfast = tab->defRmod; @@ -197,7 +197,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defRmod) { /* create default R model */ IFnewUid(ckt, &uid, (IFuid) NULL, "R", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defRmod), uid)); } IFC(newInstance, (ckt, tab->defRmod, &fast, name)); diff --git a/src/spicelib/parser/inp2s.c b/src/spicelib/parser/inp2s.c index 22aa60a08..c2d07ac0d 100644 --- a/src/spicelib/parser/inp2s.c +++ b/src/spicelib/parser/inp2s.c @@ -69,7 +69,7 @@ void INP2S(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defSmod) { /* create deafult S model */ IFnewUid(ckt, &uid, (IFuid) NULL, "S", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defSmod), uid)); } mdfast = tab->defSmod; diff --git a/src/spicelib/parser/inp2t.c b/src/spicelib/parser/inp2t.c index 8daa97ebc..5df22c1fe 100644 --- a/src/spicelib/parser/inp2t.c +++ b/src/spicelib/parser/inp2t.c @@ -53,7 +53,7 @@ void INP2T(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname4, tab, &node4); if (!tab->defTmod) { /* create deafult T model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "T", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "T", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defTmod), uid)); } IFC(newInstance, (ckt, tab->defTmod, &fast, name)); diff --git a/src/spicelib/parser/inp2u.c b/src/spicelib/parser/inp2u.c index fdcd8e965..dad139437 100644 --- a/src/spicelib/parser/inp2u.c +++ b/src/spicelib/parser/inp2u.c @@ -64,7 +64,7 @@ void INP2U(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defUmod) { /* create deafult U model */ IFnewUid(ckt, &uid, (IFuid) NULL, "U", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defUmod), uid)); } mdfast = tab->defUmod; diff --git a/src/spicelib/parser/inp2v.c b/src/spicelib/parser/inp2v.c index aeb3d4b0d..b3133925d 100644 --- a/src/spicelib/parser/inp2v.c +++ b/src/spicelib/parser/inp2v.c @@ -45,7 +45,7 @@ void INP2V(CKTcircuit *ckt, INPtables * tab, card * current) INPtermInsert(ckt, &nname2, tab, &node2); if (!tab->defVmod) { /* create default V model */ - IFnewUid(ckt, &uid, (IFuid) NULL, "V", UID_MODEL, (void **) NULL); + IFnewUid(ckt, &uid, (IFuid) NULL, "V", UID_MODEL, NULL); IFC(newModel, (ckt, type, &(tab->defVmod), uid)); } IFC(newInstance, (ckt, tab->defVmod, &fast, name)); diff --git a/src/spicelib/parser/inp2w.c b/src/spicelib/parser/inp2w.c index b9dfeeaab..16afea9b6 100644 --- a/src/spicelib/parser/inp2w.c +++ b/src/spicelib/parser/inp2w.c @@ -66,7 +66,7 @@ void INP2W(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defWmod) { /* create deafult W model */ IFnewUid(ckt, &uid, (IFuid) NULL, "W", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defWmod), uid)); } mdfast = tab->defWmod; diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c index 77174dcfe..6bd5b5b24 100644 --- a/src/spicelib/parser/inp2y.c +++ b/src/spicelib/parser/inp2y.c @@ -127,7 +127,7 @@ int lenvalgiven = 0; INPtermInsert(ckt, &internal1, tab, &inode1); if(!tab->defRmod) { /* create default R model */ - IFnewUid(ckt,&uid,(IFuid)NULL,"R",UID_MODEL,(void**)NULL); + IFnewUid(ckt, &uid, (IFuid)NULL, "R", UID_MODEL, NULL); IFC(newModel, (ckt,type,&(tab->defRmod),uid)) } mdfast = tab->defRmod; @@ -162,7 +162,7 @@ int lenvalgiven = 0; /* capacitor on node1 */ type = INPtypelook("Capacitor"); if(!tab->defCmod) { - IFnewUid(ckt,&uid,(IFuid)NULL,"C",UID_MODEL,(void**)NULL); + IFnewUid(ckt, &uid, (IFuid)NULL, "C", UID_MODEL, NULL); IFC(newModel,(ckt,type,&(tab->defCmod),uid)) } mdfast4 = tab->defCmod; @@ -210,7 +210,7 @@ int lenvalgiven = 0; type = mytype; if(!tab->defYmod) { /* create default Y model */ - IFnewUid(ckt,&uid,(IFuid)NULL,"Y",UID_MODEL,(void**)NULL); + IFnewUid(ckt, &uid, (IFuid)NULL, "Y", UID_MODEL, NULL); IFC(newModel, (ckt,type,&(tab->defYmod),uid)) } mdfast = tab->defYmod; diff --git a/src/spicelib/parser/inp2z.c b/src/spicelib/parser/inp2z.c index 15f99a6d4..efbf46c01 100644 --- a/src/spicelib/parser/inp2z.c +++ b/src/spicelib/parser/inp2z.c @@ -80,7 +80,7 @@ void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current) if (!tab->defZmod) { /* create default Z model */ IFnewUid(ckt, &uid, (IFuid) NULL, "Z", UID_MODEL, - (void **) NULL); + NULL); IFC(newModel, (ckt, type, &(tab->defZmod), uid)); } mdfast = tab->defZmod;