cleanup IFnewUid() invocations

checked for object file invariance

src/frontend/spiceif.c

@@ -252,8 +252,7 @@ if_run(CKTcircuit *ckt, char *what, wordlist *args, INPtables *tab)
         /*CDHW Create an interactive task AAA with a new UID.
           ci_specTask will point to it CDHW*/
 
-        err = IFnewUid(ft_curckt->ci_ckt, &specUid, NULL, "special",
-                       UID_TASK, NULL);
+        err = IFnewUid(ft_curckt->ci_ckt, &specUid, NULL, "special", UID_TASK, NULL);
         if (err) {
             ft_sperror(err, "newUid");
             return (2);
@@ -281,8 +280,7 @@ if_run(CKTcircuit *ckt, char *what, wordlist *args, INPtables *tab)
             }
 
         if (which != -1) { /*CDHW options are available CDHW*/
-            err = IFnewUid(ft_curckt->ci_ckt, &optUid, NULL, "options",
-                           UID_ANALYSIS, NULL);
+            err = IFnewUid(ft_curckt->ci_ckt, &optUid, NULL, "options", UID_ANALYSIS, NULL);
             if (err) {
                 ft_sperror(err, "newUid");
                 return (2);
@@ -1273,8 +1271,7 @@ if_tranparams(struct circ *ci, double *start, double *stop, double *step)
     if (which == -1)
         return (FALSE);
 
-    err = IFnewUid(ci->ci_ckt, &tranUid, NULL, "Transient Analysis",
-                   UID_ANALYSIS, NULL);
+    err = IFnewUid(ci->ci_ckt, &tranUid, NULL, "Transient Analysis", UID_ANALYSIS, NULL);
     if (err != OK)
         return (FALSE);
 

src/spicelib/analysis/acan.c

@@ -186,8 +186,7 @@ ACan(CKTcircuit *ckt, int restart)
 	    plot = NULL;
 	}
 
-        SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-                "frequency", UID_OTHER, NULL);
+        SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
         error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                            ckt->CKTcurJob->JOBname,
                                            freqUid, IF_REAL,

src/spicelib/analysis/cktmapn.c

@@ -35,12 +35,8 @@ CKTmapNode(CKTcircuit *ckt, CKTnode **node, IFuid name)
     /* not found, so must be a new one */
     error = CKTmkNode(ckt,&mynode); /*allocate the node*/
     if(error) return(error);
-    error = SPfrontEnd->IFnewUid (ckt,
-				      &uid,
-				      NULL,
-				      name,
-				      UID_SIGNAL,
-				      &mynode);  /* get a uid for it */
+    /* get a uid for it */
+    error = SPfrontEnd->IFnewUid (ckt, &uid, NULL, name, UID_SIGNAL, &mynode);
     if(error) return(error);
     mynode->name = uid;     /* set the info we have */
     mynode->type = SP_VOLTAGE;

src/spicelib/analysis/cktmkcur.c

@@ -29,8 +29,7 @@ CKTmkCur(CKTcircuit *ckt, CKTnode **node, IFuid basename, char *suffix)
     error = CKTmkNode(ckt,&mynode);
     if(error) return(error);
     checknode = mynode;
-    error = SPfrontEnd->IFnewUid (ckt, &uid, basename,
-            suffix, UID_SIGNAL, &checknode);
+    error = SPfrontEnd->IFnewUid (ckt, &uid, basename, suffix, UID_SIGNAL, &checknode);
     if(error) {
         FREE(mynode);
         if(node) *node = checknode;

src/spicelib/analysis/cktmkvol.c

@@ -27,8 +27,7 @@ CKTmkVolt(CKTcircuit *ckt, CKTnode **node, IFuid basename, char *suffix)
     error = CKTmkNode(ckt,&mynode);
     if(error) return(error);
     checknode = mynode;
-    error = SPfrontEnd->IFnewUid (ckt, &uid, basename,
-            suffix, UID_SIGNAL, &checknode);
+    error = SPfrontEnd->IFnewUid (ckt, &uid, basename, suffix, UID_SIGNAL, &checknode);
     if(error) {
         FREE(mynode);
         if(node) *node = checknode;

src/spicelib/analysis/cktnoise.c

@@ -56,12 +56,12 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 
 	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
-		    NULL, "onoise_spectrum", UID_OTHER, NULL);
+                                  NULL, "onoise_spectrum", UID_OTHER, NULL);
 
 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 
 	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
-		    NULL, "inoise_spectrum", UID_OTHER, NULL);
+                                  NULL, "inoise_spectrum", UID_OTHER, NULL);
 
 	    /* we've added two more plots */
 
@@ -73,11 +73,11 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 
 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
-		NULL, "onoise_total", UID_OTHER, NULL);
+                                  NULL, "onoise_total", UID_OTHER, NULL);
 
 	    data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
 	    SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]),
-		NULL, "inoise_total", UID_OTHER, NULL);
+                                  NULL, "inoise_total", UID_OTHER, NULL);
 	    /* we've added two more plots */
 
 	    data->outpVector =

src/spicelib/analysis/cktsens.c

@@ -181,9 +181,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
 					sg->ptable[sg->param].keyword);
 			}
 
-			SPfrontEnd->IFnewUid (ckt,
-				output_names + k, NULL,
-				namebuf, UID_OTHER, NULL);
+			SPfrontEnd->IFnewUid (ckt, output_names + k, NULL, namebuf, UID_OTHER, NULL);
 			k += 1;
 		}
 
@@ -192,9 +190,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
 			freq_name = NULL;
 		} else {
 			type = IF_COMPLEX;
-			SPfrontEnd->IFnewUid (ckt,
-				&freq_name, NULL,
-				"frequency", UID_OTHER, NULL);
+			SPfrontEnd->IFnewUid (ckt, &freq_name, NULL, "frequency", UID_OTHER, NULL);
 		}
 
                 error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,

src/spicelib/analysis/dcpss.c

@@ -237,8 +237,7 @@ DCpss(CKTcircuit *ckt,
 	/* Time Domain plot start and prepared to be filled in later */
         error = CKTnames(ckt,&numNames,&nameList);
         if(error) return(error);
-        SPfrontEnd->IFnewUid (ckt, &timeUid, NULL,
-                "time", UID_OTHER, NULL);
+        SPfrontEnd->IFnewUid (ckt, &timeUid, NULL, "time", UID_OTHER, NULL);
         error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                            "Time Domain Periodic Steady State Analysis",
                                            timeUid, IF_REAL,

src/spicelib/analysis/dctran.c

@@ -154,8 +154,7 @@ DCtran(CKTcircuit *ckt,
 #endif
         error = CKTnames(ckt,&numNames,&nameList);
         if(error) return(error);
-        SPfrontEnd->IFnewUid (ckt, &timeUid, NULL,
-                "time", UID_OTHER, NULL);
+        SPfrontEnd->IFnewUid (ckt, &timeUid, NULL, "time", UID_OTHER, NULL);
         error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                            ckt->CKTcurJob->JOBname,
                                            timeUid, IF_REAL,

src/spicelib/analysis/dctrcurv.c

@@ -193,27 +193,22 @@ found:;
     
     
     if (job->TRCVvType[i] == vcode)
-         SPfrontEnd->IFnewUid (ckt, &varUid, NULL,
-            "v-sweep", UID_OTHER, NULL);
+         SPfrontEnd->IFnewUid (ckt, &varUid, NULL, "v-sweep", UID_OTHER, NULL);
         
     else {
         if (job->TRCVvType[i] == icode)
-            SPfrontEnd->IFnewUid (ckt, &varUid, NULL,
-                 "i-sweep", UID_OTHER, NULL);
+            SPfrontEnd->IFnewUid (ckt, &varUid, NULL, "i-sweep", UID_OTHER, NULL);
                      
         else {
             if (job->TRCVvType[i] == TEMP_CODE)
-                SPfrontEnd->IFnewUid (ckt, &varUid, NULL,
-                   "temp-sweep", UID_OTHER, NULL);
+                SPfrontEnd->IFnewUid (ckt, &varUid, NULL, "temp-sweep", UID_OTHER, NULL);
        
             else {
                 if (job->TRCVvType[i] == rcode)
-                    SPfrontEnd->IFnewUid (ckt, &varUid, NULL,
-                        "res-sweep", UID_OTHER, NULL);
+                    SPfrontEnd->IFnewUid (ckt, &varUid, NULL, "res-sweep", UID_OTHER, NULL);
                                 
                 else
-                    SPfrontEnd->IFnewUid (ckt, &varUid, NULL,
-                        "?-sweep", UID_OTHER, NULL);
+                    SPfrontEnd->IFnewUid (ckt, &varUid, NULL, "?-sweep", UID_OTHER, NULL);
             } /* icode */
         } /* TEMP_CODE */
     } /* rcode*/

src/spicelib/analysis/distoan.c

@@ -516,8 +516,7 @@ time1 = SPfrontEnd->IFseconds();
 	if (! job->Df2wanted) {
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-		"frequency", UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
         SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                    "DISTORTION - 2nd harmonic",
                                    freqUid, IF_REAL,
@@ -542,8 +541,7 @@ time1 = SPfrontEnd->IFseconds();
 
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-		"frequency", UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
         SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                    "DISTORTION - 3rd harmonic",
                                    freqUid, IF_REAL,
@@ -566,8 +564,7 @@ time1 = SPfrontEnd->IFseconds();
 
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-		"frequency", UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
         SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                    "DISTORTION - IM: f1+f2",
                                    freqUid, IF_REAL,
@@ -588,8 +585,7 @@ time1 = SPfrontEnd->IFseconds();
 
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-		"frequency", UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
         SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                    "DISTORTION - IM: f1-f2",
                                    freqUid, IF_REAL,
@@ -611,8 +607,7 @@ time1 = SPfrontEnd->IFseconds();
 
 	error = CKTnames(ckt,&numNames,&nameList);
 	if(error) return(error);
-	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-		"frequency", UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
         SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
                                    "DISTORTION - IM: 2f1-f2",
                                    freqUid, IF_REAL,

src/spicelib/analysis/noisean.c

@@ -118,8 +118,7 @@ NOISEan (CKTcircuit *ckt, int restart)
 	/* the current front-end needs the namelist to be fully
 		declared before an OUTpBeginplot */
 
-	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL,
-		"frequency", UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &freqUid, NULL, "frequency", UID_OTHER, NULL);
 
 	data->numPlots = 0;                /* we don't have any plots  yet */
         error = CKTnoise(ckt,N_DENS,N_OPEN,data);

src/spicelib/analysis/pzan.c

@@ -141,13 +141,11 @@ PZpost(CKTcircuit *ckt)
     j = 0;
     for (i = 0; i < job->PZnPoles; i++) {
 	sprintf(name, "pole(%-u)", i+1);
-	SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), NULL,
-		name, UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), NULL, name, UID_OTHER, NULL);
     }
     for (i = 0; i < job->PZnZeros; i++) {
 	sprintf(name, "zero(%-u)", i+1);
-	SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), NULL,
-		name, UID_OTHER, NULL);
+	SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), NULL, name, UID_OTHER, NULL);
     }
 
     SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,

src/spicelib/analysis/tfanal.c

@@ -91,23 +91,19 @@ TFanal(CKTcircuit *ckt, int restart)
     ckt->CKTrhs[0]=0;
 
     /* make a UID for the transfer function output */
-    SPfrontEnd->IFnewUid (ckt, &tfuid, NULL, "Transfer_function",
-            UID_OTHER, NULL);
+    SPfrontEnd->IFnewUid (ckt, &tfuid, NULL, "Transfer_function", UID_OTHER, NULL);
 
     /* make a UID for the input impedance */
-    SPfrontEnd->IFnewUid (ckt, &inuid, job->TFinSrc,
-            "Input_impedance", UID_OTHER, NULL);
+    SPfrontEnd->IFnewUid (ckt, &inuid, job->TFinSrc, "Input_impedance", UID_OTHER, NULL);
 
     /* make a UID for the output impedance */
     if (job->TFoutIsI) {
-        SPfrontEnd->IFnewUid (ckt, &outuid, job->TFoutSrc
-                ,"Output_impedance", UID_OTHER, NULL);
+        SPfrontEnd->IFnewUid (ckt, &outuid, job->TFoutSrc ,"Output_impedance", UID_OTHER, NULL);
     } else {
         name = TMALLOC(char, strlen(job->TFoutName) + 22);
         (void)sprintf(name,"output_impedance_at_%s",
                 job->TFoutName);
-        SPfrontEnd->IFnewUid (ckt, &outuid, NULL,
-                name, UID_OTHER, NULL);
+        SPfrontEnd->IFnewUid (ckt, &outuid, NULL, name, UID_OTHER, NULL);
     }
 
     error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,

src/spicelib/parser/inp2c.c

@@ -81,8 +81,7 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, card * current)
           line = saveline;    /* go back */
           type = mytype;
           if (!tab->defCmod) {    /* create default C model */
-          IFnewUid(ckt, &uid, NULL, "C", UID_MODEL,
-               NULL);
+          IFnewUid(ckt, &uid, NULL, "C", UID_MODEL, NULL);
           IFC(newModel, (ckt, type, &(tab->defCmod), uid));
           }
           mdfast = tab->defCmod;
@@ -94,8 +93,7 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, card * current)
       type = mytype;
       if (!tab->defCmod) {
           /* create default C model */
-          IFnewUid(ckt, &uid, NULL, "C", UID_MODEL,
-               NULL);
+          IFnewUid(ckt, &uid, NULL, "C", UID_MODEL, NULL);
           IFC(newModel, (ckt, type, &(tab->defCmod), uid));
       }
       IFC(newInstance, (ckt, tab->defCmod, &fast, name));

src/spicelib/parser/inp2d.c

@@ -67,8 +67,7 @@ void INP2D(CKTcircuit *ckt, INPtables * tab, card * current)
 	type = mytype;
 	if (!tab->defDmod) {
 	    /* create default D model */
-	    IFnewUid(ckt, &uid, NULL, "D", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "D", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defDmod), uid));
 	}
 	mdfast = tab->defDmod;

src/spicelib/parser/inp2j.c

@@ -65,8 +65,7 @@ void INP2J(CKTcircuit *ckt, INPtables * tab, card * current)
 	}
 	if (!tab->defJmod) {
 	    /* create default J model */
-	    IFnewUid(ckt, &uid, NULL, "J", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "J", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defJmod), uid));
 	}
 	mdfast = tab->defJmod;

src/spicelib/parser/inp2l.c

@@ -81,8 +81,7 @@ void INP2L(CKTcircuit *ckt, INPtables * tab, card * current)
           line = saveline;    /* go back */
           type = mytype;
           if (!tab->defLmod) {    /* create default L model */
-          IFnewUid(ckt, &uid, NULL, "L", UID_MODEL,
-               NULL);
+          IFnewUid(ckt, &uid, NULL, "L", UID_MODEL, NULL);
           IFC(newModel, (ckt, type, &(tab->defLmod), uid));
           }
           mdfast = tab->defLmod;
@@ -94,8 +93,7 @@ void INP2L(CKTcircuit *ckt, INPtables * tab, card * current)
       type = mytype;
       if (!tab->defLmod) {
           /* create default L model */
-          IFnewUid(ckt, &uid, NULL, "L", UID_MODEL,
-               NULL);
+          IFnewUid(ckt, &uid, NULL, "L", UID_MODEL, NULL);
           IFC(newModel, (ckt, type, &(tab->defLmod), uid));
       }
       IFC(newInstance, (ckt, tab->defLmod, &fast, name));

src/spicelib/parser/inp2o.c

@@ -76,8 +76,7 @@ void INP2O(CKTcircuit *ckt, INPtables * tab, card * current)
     } else {
 	if (!tab->defOmod) {
 	    /* create default O model */
-	    IFnewUid(ckt, &uid, NULL, "O", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "O", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defOmod), uid));
 	}
 	mdfast = tab->defOmod;

src/spicelib/parser/inp2r.c

@@ -172,8 +172,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, card * current)
           line = saveline;	/* go back */
           type = mytype;
           if (!tab->defRmod) {	/* create default R model */
-            IFnewUid(ckt, &uid, NULL, "R", UID_MODEL,
-                NULL);
+            IFnewUid(ckt, &uid, NULL, "R", UID_MODEL, NULL);
             IFC(newModel, (ckt, type, &(tab->defRmod), uid));
           }
           mdfast = tab->defRmod;
@@ -185,8 +184,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, card * current)
       type = mytype;
       if (!tab->defRmod) {
           /* create default R model */
-          IFnewUid(ckt, &uid, NULL, "R", UID_MODEL,
-              NULL);
+          IFnewUid(ckt, &uid, NULL, "R", UID_MODEL, NULL);
           IFC(newModel, (ckt, type, &(tab->defRmod), uid));
       }
       IFC(newInstance, (ckt, tab->defRmod, &fast, name));

src/spicelib/parser/inp2s.c

@@ -68,8 +68,7 @@ void INP2S(CKTcircuit *ckt, INPtables * tab, card * current)
 	type = mytype;
 	if (!tab->defSmod) {
 	    /* create deafult S model */
-	    IFnewUid(ckt, &uid, NULL, "S", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "S", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defSmod), uid));
 	}
 	mdfast = tab->defSmod;

src/spicelib/parser/inp2u.c

@@ -62,8 +62,7 @@ void INP2U(CKTcircuit *ckt, INPtables * tab, card * current)
 	type = mytype;
 	if (!tab->defUmod) {
 	    /* create deafult U model */
-	    IFnewUid(ckt, &uid, NULL, "U", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "U", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defUmod), uid));
 	}
 	mdfast = tab->defUmod;

src/spicelib/parser/inp2w.c

@@ -65,8 +65,7 @@ void INP2W(CKTcircuit *ckt, INPtables * tab, card * current)
 	type = mytype;
 	if (!tab->defWmod) {
 	    /* create deafult W model */
-	    IFnewUid(ckt, &uid, NULL, "W", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "W", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defWmod), uid));
 	}
 	mdfast = tab->defWmod;

src/spicelib/parser/inp2z.c

@@ -79,8 +79,7 @@ void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current)
 		
 	if (!tab->defZmod) {
 	    /* create default Z model */
-	    IFnewUid(ckt, &uid, NULL, "Z", UID_MODEL,
-		     NULL);
+	    IFnewUid(ckt, &uid, NULL, "Z", UID_MODEL, NULL);
 	    IFC(newModel, (ckt, type, &(tab->defZmod), uid));
 	}
 	mdfast = tab->defZmod;