From 2b66531eb4bf10a724f3a808935fbc22b2858550 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 8 May 2011 12:52:58 +0000
Subject: [PATCH] mop up some fixme comments

---
 ChangeLog                          | 20 ++++++++++++++++++++
 src/frontend/shyu.c                |  3 +--
 src/frontend/spiceif.c             | 27 +++++++++------------------
 src/spicelib/analysis/cktdest.c    |  3 +--
 src/spicelib/analysis/cktdltm.c    |  5 ++---
 src/spicelib/analysis/cktdltn.c    |  3 +--
 src/spicelib/analysis/cktdojob.c   |  4 +---
 src/spicelib/analysis/cktfnda.c    |  3 +--
 src/spicelib/analysis/cktgrnd.c    |  4 +---
 src/spicelib/analysis/cktneweq.c   |  3 +--
 src/spicelib/analysis/cktnewn.c    |  3 +--
 src/spicelib/analysis/cktparam.c   |  5 ++---
 src/spicelib/analysis/ckttroub.c   |  3 +--
 src/spicelib/devices/cktask.c      |  5 ++---
 src/spicelib/devices/cktbindnode.c |  3 +--
 src/spicelib/devices/cktcrte.c     |  7 +++----
 src/spicelib/devices/cktfinddev.c  |  3 +--
 src/xspice/ipc/ipctiein.c          |  4 +---
 18 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4a464387..1e2db96f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-05-08  Robert Larice
+ * src/frontend/shyu.c ,
+ * src/frontend/spiceif.c ,
+ * src/spicelib/analysis/cktdest.c ,
+ * src/spicelib/analysis/cktdltm.c ,
+ * src/spicelib/analysis/cktdltn.c ,
+ * src/spicelib/analysis/cktdojob.c ,
+ * src/spicelib/analysis/cktfnda.c ,
+ * src/spicelib/analysis/cktgrnd.c ,
+ * src/spicelib/analysis/cktneweq.c ,
+ * src/spicelib/analysis/cktnewn.c ,
+ * src/spicelib/analysis/cktparam.c ,
+ * src/spicelib/analysis/ckttroub.c ,
+ * src/spicelib/devices/cktask.c ,
+ * src/spicelib/devices/cktbindnode.c ,
+ * src/spicelib/devices/cktcrte.c ,
+ * src/spicelib/devices/cktfinddev.c ,
+ * src/xspice/ipc/ipctiein.c :
+    mop up some fixme comments
+
 2011-05-08  Robert Larice
  * src/frontend/help/x11disp.c :
     cleanup Xt usage
diff --git a/src/frontend/shyu.c b/src/frontend/shyu.c
index 617f125d2..ba7e3c0ab 100644
--- a/src/frontend/shyu.c
+++ b/src/frontend/shyu.c
@@ -25,9 +25,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 
 
 int
-if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
+if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
 {
-    CKTcircuit *ckt = /* fixme, drop that */ t;
     JOB *senseJob;
     JOB *acJob;
     JOB *opJob;
diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index e546ef3f6..e5c6f3694 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -161,8 +161,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
     ft_curckt->ci_curTask = ft_curckt->ci_defTask;
     
     INPpas1( ckt, (card *) deck->li_next, *tab);
-    INPpas2( ckt, (card *) deck->li_next,
-            (INPtables *) *tab,ft_curckt->ci_defTask);
+    INPpas2( ckt, (card *) deck->li_next, *tab, ft_curckt->ci_defTask);
     INPkillMods();
 
     /* INPpas2 has been modified to ignore .NODESET and .IC
@@ -170,7 +169,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
      * nodeset/ic of non-existant nodes.  */
 
     INPpas3(ckt, (card *) deck->li_next,
-            (INPtables *) *tab,ft_curckt->ci_defTask, ft_sim->nodeParms,
+            *tab, ft_curckt->ci_defTask, ft_sim->nodeParms,
 	    ft_sim->numNodeParms);
 
 #ifdef XSPICE
@@ -194,9 +193,8 @@ if_inpdeck(struct line *deck, INPtables **tab)
  * typed at the keyboard, error in the simulation, etc). args should
  * be the entire command line, e.g. "tran 1 10 20 uic" */
 int
-if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab)
+if_run(CKTcircuit *ckt, char *what, wordlist *args, INPtables *tab)
 {
-    CKTcircuit *ckt = /* fixme, drop that */ t;
     int err;
     struct line deck;
     char buf[BSIZE_SP];
@@ -386,7 +384,6 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
 {
     IFvalue pval;
     int err, i;
-    CKTcircuit *cc = /* fixme, drop that */ ckt;
     char **vv;
     int which = -1;
 
@@ -494,12 +491,12 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
     }
 
 #if (0)
-     if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_curOpt,
+     if ((err = ft_sim->setAnalysisParm (ckt, ft_curckt->ci_curOpt,
              ft_sim->analyses[which]->analysisParms[i].id, &pval,
              NULL)) != OK)
          ft_sperror(err, "setAnalysisParm(options) ci_curOpt");
 #else /*CDHW*/
-     if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_defOpt,
+     if ((err = ft_sim->setAnalysisParm (ckt, ft_curckt->ci_defOpt,
              ft_sim->analyses[which]->analysisParms[i].id, &pval,
              NULL)) != OK)
          ft_sperror(err, "setAnalysisParm(options) ci_curOpt");
@@ -537,20 +534,14 @@ if_dump(CKTcircuit *ckt, FILE *file)
 {
     NG_IGNORE(ckt);
 
-    /*void *cc = (void *) ckt;*/
-
     fprintf(file,"diagnostic output dump unavailable.");
-    return;
 }
 
 void
 if_cktfree(CKTcircuit *ckt, INPtables *tab)
 {
-    CKTcircuit *cc = /* fixme, drop that */ ckt;
-
-    ft_sim->deleteCircuit (cc);
+    ft_sim->deleteCircuit (ckt);
     INPtabEnd(tab);
-    return;
 }
 
 /* Return a string describing an error code. */
@@ -575,7 +566,7 @@ if_errstring(int code)
  */
 static int 
 finddev_special(
-    CKTcircuit *ck,
+    CKTcircuit *ckt,
     char *name,
     GENinstance **devptr,
     GENmodel **modptr,
@@ -584,7 +575,7 @@ finddev_special(
     int err;
     int type = -1;
 
-    err = ft_sim->findInstance (ck, &type, devptr, name, NULL, NULL);
+    err = ft_sim->findInstance (ckt, &type, devptr, name, NULL, NULL);
     if(err == OK)
     {
      *device_or_model=0;
@@ -592,7 +583,7 @@ finddev_special(
     }
     type = -1;
     *devptr = NULL;
-    err = ft_sim->findModel (ck, &type, modptr, name);
+    err = ft_sim->findModel (ckt, &type, modptr, name);
     if(err == OK)
     {
      *device_or_model=1;
diff --git a/src/spicelib/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c
index 44b40bb99..faa0a5db4 100644
--- a/src/spicelib/analysis/cktdest.c
+++ b/src/spicelib/analysis/cktdest.c
@@ -19,9 +19,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTdestroy(CKTcircuit *inCkt)
+CKTdestroy(CKTcircuit *ckt)
 {
-    CKTcircuit *ckt = /* fixme, drop that */ inCkt;
     int i;
     CKTnode *node;
     CKTnode *nnode;
diff --git a/src/spicelib/analysis/cktdltm.c b/src/spicelib/analysis/cktdltm.c
index d9eaa8736..1d54c68b8 100644
--- a/src/spicelib/analysis/cktdltm.c
+++ b/src/spicelib/analysis/cktdltm.c
@@ -16,10 +16,9 @@ Author: 1985 Thomas L. Quarles
 
 /* ARGSUSED */
 int
-CKTdltMod(CKTcircuit *cktp, GENmodel *modPtr)
+CKTdltMod(CKTcircuit *ckt, GENmodel *m)
 {
-    CKTcircuit *ckt = /* fixme, drop that */ cktp;
-    GENmodel *m = /* fixme, drop that */ modPtr, *mod, **prevp;
+    GENmodel *mod, **prevp;
     GENinstance *h, *next_i;
     int	error;
 
diff --git a/src/spicelib/analysis/cktdltn.c b/src/spicelib/analysis/cktdltn.c
index 20bca346a..b06b3c25e 100644
--- a/src/spicelib/analysis/cktdltn.c
+++ b/src/spicelib/analysis/cktdltn.c
@@ -18,9 +18,8 @@ CKTdltNod(CKTcircuit *ckt, CKTnode *node)
 }
 
 int
-CKTdltNNum(CKTcircuit *cktp, int num)
+CKTdltNNum(CKTcircuit *ckt, int num)
 {
-    CKTcircuit *ckt = /* fixme, drop that */  cktp;
     CKTnode *n, *prev, *node, *sprev;
     int	error;
 
diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c
index c59d55926..cb9d23f67 100644
--- a/src/spicelib/analysis/cktdojob.c
+++ b/src/spicelib/analysis/cktdojob.c
@@ -24,10 +24,8 @@ Modified: 2000 AlansFixes
 extern SPICEanalysis *analInfo[];
 
 int
-CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
+CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task)
 {
-    CKTcircuit	*ckt = /* fixme, drop that */ inCkt;
-    TSKtask	*task = /* fixme, drop that */ inTask;
     JOB		*job;
     double	startTime;
     int		error, i, error2;
diff --git a/src/spicelib/analysis/cktfnda.c b/src/spicelib/analysis/cktfnda.c
index d60ed0331..a2d13e3b1 100644
--- a/src/spicelib/analysis/cktfnda.c
+++ b/src/spicelib/analysis/cktfnda.c
@@ -20,9 +20,8 @@ Author: 1985 Thomas L. Quarles
 
 /* ARGSUSED */
 int
-CKTfndAnal(CKTcircuit *ckt, int *analIndex, JOB **anal, IFuid name, TSKtask *inTask, IFuid taskName)
+CKTfndAnal(CKTcircuit *ckt, int *analIndex, JOB **anal, IFuid name, TSKtask *task, IFuid taskName)
 {
-    TSKtask *task = /* fixme, drop that */ inTask;
     JOB *here;
 
     NG_IGNORE(ckt);
diff --git a/src/spicelib/analysis/cktgrnd.c b/src/spicelib/analysis/cktgrnd.c
index 81a1b45ff..d4248189a 100644
--- a/src/spicelib/analysis/cktgrnd.c
+++ b/src/spicelib/analysis/cktgrnd.c
@@ -17,10 +17,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTground(CKTcircuit *inCkt, CKTnode **node, IFuid name)
+CKTground(CKTcircuit *ckt, CKTnode **node, IFuid name)
 {
-    CKTcircuit *ckt = /* fixme, drop that */ inCkt;
-
     if(ckt->CKTnodes) {
         if(ckt->CKTnodes->name) {
             /*already exists - keep old name, but return it */
diff --git a/src/spicelib/analysis/cktneweq.c b/src/spicelib/analysis/cktneweq.c
index 02b72f683..42202bb20 100644
--- a/src/spicelib/analysis/cktneweq.c
+++ b/src/spicelib/analysis/cktneweq.c
@@ -19,10 +19,9 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTnewEq(CKTcircuit *inCkt, CKTnode **node, IFuid name)
+CKTnewEq(CKTcircuit *ckt, CKTnode **node, IFuid name)
 {
     CKTnode *mynode;
-    CKTcircuit *ckt = /* fixme, drop that */ inCkt;
     int error;
 
     error = CKTmkNode(ckt,&mynode);
diff --git a/src/spicelib/analysis/cktnewn.c b/src/spicelib/analysis/cktnewn.c
index 3d59d12a3..68a76ecb1 100644
--- a/src/spicelib/analysis/cktnewn.c
+++ b/src/spicelib/analysis/cktnewn.c
@@ -20,9 +20,8 @@ Author: 1985 Thomas L. Quarles
 
 /* should just call CKTnewEQ and set node type afterwards */
 int
-CKTnewNode(CKTcircuit *inCkt, CKTnode **node, IFuid name)
+CKTnewNode(CKTcircuit *ckt, CKTnode **node, IFuid name)
 {
-    CKTcircuit *ckt = /* fixme, drop that */ inCkt;
     if(!(ckt->CKTnodes)) { /*  starting the list - allocate both ground and 1 */
         ckt->CKTnodes = TMALLOC(CKTnode, 1);
         if(ckt->CKTnodes == NULL) return(E_NOMEM);
diff --git a/src/spicelib/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c
index 76502be2f..993b46a5b 100644
--- a/src/spicelib/analysis/cktparam.c
+++ b/src/spicelib/analysis/cktparam.c
@@ -19,13 +19,12 @@ int
 CKTparam(CKTcircuit *ckt, GENinstance *fast, int param, IFvalue *val, IFvalue *selector)
 {
     int type;
-    GENinstance *myfast = /*fixme*/ fast;
 
     NG_IGNORE(ckt);
 
-    type = myfast->GENmodPtr->GENmodType;
+    type = fast->GENmodPtr->GENmodType;
     if(DEVices[type]->DEVparam) {
-        return(DEVices[type]->DEVparam (param, val, myfast, selector));
+        return(DEVices[type]->DEVparam (param, val, fast, selector));
     } else {
         return(E_BADPARM);
     }
diff --git a/src/spicelib/analysis/ckttroub.c b/src/spicelib/analysis/ckttroub.c
index dbf600af4..fd3be413b 100644
--- a/src/spicelib/analysis/ckttroub.c
+++ b/src/spicelib/analysis/ckttroub.c
@@ -16,9 +16,8 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 extern SPICEanalysis *analInfo[];
 
 char *
-CKTtrouble(CKTcircuit *cktp, char *optmsg)
+CKTtrouble(CKTcircuit *ckt, char *optmsg)
 {
-    CKTcircuit	*ckt = /* fixme, drop that */ cktp;
     char	msg_buf[513];
     char	*emsg;
     TRCV	*cv;
diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c
index 0c9068169..66de43812 100644
--- a/src/spicelib/devices/cktask.c
+++ b/src/spicelib/devices/cktask.c
@@ -15,9 +15,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *selector)
+CKTask(CKTcircuit *ckt, GENinstance *instance, int which, IFvalue *value, IFvalue *selector)
 {
-    GENinstance *instance = /*fixme*/ fast;
     int type = instance->GENmodPtr->GENmodType;
     int error;
 #ifdef PARALLEL_ARCH
@@ -29,7 +28,7 @@ CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *s
     DEVices = devices();
     if(DEVices[type]->DEVask) {
         error = DEVices[type]->DEVask(ckt,
-                fast, which, value, selector);
+                instance, which, value, selector);
     } else {
 	error = E_BADPARM;
     }
diff --git a/src/spicelib/devices/cktbindnode.c b/src/spicelib/devices/cktbindnode.c
index 69dce6b37..08ee9ec72 100644
--- a/src/spicelib/devices/cktbindnode.c
+++ b/src/spicelib/devices/cktbindnode.c
@@ -17,11 +17,10 @@ Author: 1985 Thomas L. Quarles
 #include "dev.h"
 
 int
-CKTbindNode(CKTcircuit *ckt, GENinstance *fast, int term, CKTnode *node)
+CKTbindNode(CKTcircuit *ckt, GENinstance *instance, int term, CKTnode *node)
 {
     int mappednode;
     SPICEdev **devs;
-    GENinstance *instance = /*fixme*/ fast;
     int type = instance->GENmodPtr->GENmodType;
 
     NG_IGNORE(ckt);
diff --git a/src/spicelib/devices/cktcrte.c b/src/spicelib/devices/cktcrte.c
index 27f6da7ef..c08e345a4 100644
--- a/src/spicelib/devices/cktcrte.c
+++ b/src/spicelib/devices/cktcrte.c
@@ -16,10 +16,9 @@ Author: 1985 Thomas L. Quarles
 #include "memory.h"
 
 int
-CKTcrtElt(CKTcircuit *ckt, GENmodel *inModPtr, GENinstance **inInstPtr, IFuid name)
+CKTcrtElt(CKTcircuit *ckt, GENmodel *modPtr, GENinstance **inInstPtr, IFuid name)
 {
   GENinstance *instPtr = NULL;             /* instPtr points to the data struct for per-instance data */
-  GENmodel *modPtr = /*fixme*/ inModPtr;  /* modPtr points to the data struct for per-model data */
 
     SPICEdev **DEVices;
     int error;
@@ -32,8 +31,8 @@ CKTcrtElt(CKTcircuit *ckt, GENmodel *inModPtr, GENinstance **inInstPtr, IFuid na
 
     type = modPtr->GENmodType;
 
-    error = CKTfndDev(ckt, &type, &instPtr, name, inModPtr,
-		      NULL );
+    error = CKTfndDev(ckt, &type, &instPtr, name, modPtr, NULL);
+
     if (error == OK) { 
         if (inInstPtr)
 	    *inInstPtr = instPtr;
diff --git a/src/spicelib/devices/cktfinddev.c b/src/spicelib/devices/cktfinddev.c
index 4febadaf9..917bdb2d7 100644
--- a/src/spicelib/devices/cktfinddev.c
+++ b/src/spicelib/devices/cktfinddev.c
@@ -11,9 +11,8 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTfndDev(CKTcircuit *Ckt, int *type, GENinstance **fast, IFuid name, GENmodel *modfast, IFuid modname)
+CKTfndDev(CKTcircuit *ckt, int *type, GENinstance **fast, IFuid name, GENmodel *modfast, IFuid modname)
 {
-    CKTcircuit *ckt= /* fixme, drop that */ Ckt;
    GENinstance *here;
    GENmodel *mods;
 
diff --git a/src/xspice/ipc/ipctiein.c b/src/xspice/ipc/ipctiein.c
index bd32de09b..2736da03a 100755
--- a/src/xspice/ipc/ipctiein.c
+++ b/src/xspice/ipc/ipctiein.c
@@ -374,7 +374,7 @@ determines what instances will have data returned over the IPC channel.
 
 
 int ipc_get_devices(
-    CKTcircuit  *circuit,     /* The circuit structure */
+    CKTcircuit  *ckt,         /* The circuit structure */
     char        *device,      /* The device name as it appears in the info struct */
     char        ***names,     /* Array of name strings to be built */
     double      **modtypes)   /* Array of types to be built */
@@ -383,7 +383,6 @@ int ipc_get_devices(
     int         num_instances;
     GENmodel    *model;
     GENinstance *here;
-    CKTcircuit  *ckt;
     char        *inst_name;
     int         inst_name_len;
     int         i;
@@ -395,7 +394,6 @@ int ipc_get_devices(
     MOS3model        *MOS3mod;
 
     /* Initialize local variables */
-    ckt = /* fixme, drop that */ circuit;
     num_instances = 0;
 
     /* Get the index into the circuit structure linked list of models */