From 0cc59b1dc8d337e6da0f29c7c0660ca687bdcd0a Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 30 Jun 2013 20:24:13 +0200
Subject: [PATCH] cleanup CKTfndDev(), findInstance() invocation

---
 src/spicelib/analysis/noisean.c     | 6 ++----
 src/spicelib/analysis/tfanal.c      | 7 ++-----
 src/spicelib/devices/ind/mutsetup.c | 6 ++----
 src/spicelib/parser/inpaname.c      | 3 +--
 src/unsupported/snstart.c           | 4 +---
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index 06a2ae81c..f42c6f33e 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -47,8 +47,7 @@ NOISEan (CKTcircuit *ckt, int restart)
     inst = NULL;
     code = CKTtypelook("Vsource");
     if (code != -1) {
-        error = CKTfndDev(ckt, &code, &inst,
-                job->input, NULL, NULL);
+        error = CKTfndDev(ckt, &code, &inst, job->input, NULL, NULL);
 	if (!error && !((VSRCinstance *)inst)->VSRCacGiven) {
 	    errMsg = TMALLOC(char, strlen(noacinput) + 1);
 	    strcpy(errMsg,noacinput);
@@ -58,8 +57,7 @@ NOISEan (CKTcircuit *ckt, int restart)
 
     code = CKTtypelook("Isource");
     if (code != -1 && inst==NULL) {
-        error = CKTfndDev(ckt, &code, &inst,
-                job->input, NULL, NULL);
+        error = CKTfndDev(ckt, &code, &inst, job->input, NULL, NULL);
         if (error) {
 	    /* XXX ??? */
             SPfrontEnd->IFerror (ERR_WARNING,
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index aa7fa2439..c29f32a5b 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -51,8 +51,7 @@ TFanal(CKTcircuit *ckt, int restart)
     Itype = CKTtypelook("Isource");
     Vtype = CKTtypelook("Vsource");
     if(Itype != -1) {
-        error = CKTfndDev(ckt,&Itype,&ptr,
-                job->TFinSrc, NULL, NULL);
+        error = CKTfndDev(ckt, &Itype, &ptr, job->TFinSrc, NULL, NULL);
         if(error ==0) {
             job->TFinIsI = 1;
             job->TFinIsV = 0;
@@ -62,9 +61,7 @@ TFanal(CKTcircuit *ckt, int restart)
     }
 
     if( (Vtype != -1) && (ptr==NULL) ) {
-        error = CKTfndDev(ckt,&Vtype,&ptr,
-                job->TFinSrc, NULL,
-                NULL);
+        error = CKTfndDev(ckt, &Vtype, &ptr, job->TFinSrc, NULL, NULL);
         job->TFinIsV = 1;
         job->TFinIsI = 0;
         if(error !=0) {
diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c
index fd19a3710..07f221ab1 100644
--- a/src/spicelib/devices/ind/mutsetup.c
+++ b/src/spicelib/devices/ind/mutsetup.c
@@ -43,8 +43,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                 return(E_INTERN);
             }
 
-            error = CKTfndDev(ckt,&ktype,(GENinstance **)&(here->MUTind1),
-                              here->MUTindName1, NULL, NULL);
+            error = CKTfndDev(ckt, &ktype, (GENinstance **) &(here->MUTind1), here->MUTindName1, NULL, NULL);
             if(error && error!= E_NODEV && error != E_NOMOD) return(error);
             if(error) {
                 IFuid namarray[2];
@@ -54,8 +53,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                     "%s: coupling to non-existant inductor %s.",
                     namarray);
             }
-            error = CKTfndDev(ckt,&ktype,(GENinstance **)&(here->MUTind2),
-                    here->MUTindName2, NULL, NULL);
+            error = CKTfndDev(ckt, &ktype, (GENinstance **) &(here->MUTind2), here->MUTindName2, NULL, NULL);
             if(error && error!= E_NODEV && error != E_NOMOD) return(error);
             if(error) {
                 IFuid namarray[2];
diff --git a/src/spicelib/parser/inpaname.c b/src/spicelib/parser/inpaname.c
index 5a251f916..2679835f9 100644
--- a/src/spicelib/parser/inpaname.c
+++ b/src/spicelib/parser/inpaname.c
@@ -40,8 +40,7 @@ INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam,
      * (name, type, direct pointer) - the type and direct pointer
      * WILL be set on return unless error is not OK
      */
-    error = sim->findInstance (ckt, dev, fast, devnam, NULL,
-				    NULL);
+    error = sim->findInstance (ckt, dev, fast, devnam, NULL, NULL);
     if (error)
 	return (error);
 
diff --git a/src/unsupported/snstart.c b/src/unsupported/snstart.c
index 9d812494a..ce29683b1 100644
--- a/src/unsupported/snstart.c
+++ b/src/unsupported/snstart.c
@@ -43,9 +43,7 @@ SENstartup(CKTcircuit *ckt, int restart)
         type = -1;
         fast = NULL;
 
-        err = CKTfndDev(ckt, &type, &fast,
-                        ckt->CKTsenInfo->SENdevices[i],
-                        NULL, NULL);
+        err = CKTfndDev(ckt, &type, &fast, ckt->CKTsenInfo->SENdevices[i], NULL, NULL);
         if (err != OK)
             return err;