From 4df9e9a4108e76167a444791f77d45e87e3a07ed Mon Sep 17 00:00:00 2001
From: arno <arno>
Date: Sat, 17 Jun 2000 14:42:03 +0000
Subject: [PATCH] 	* src/analysis/*.c: Removed register keywords, as they
 are 	useless with the current compilers.

---
 src/analysis/acan.c     |  6 +++---
 src/analysis/cktaccpt.c |  4 ++--
 src/analysis/cktacdum.c | 10 +++++-----
 src/analysis/cktask.c   |  2 +-
 src/analysis/cktaskaq.c |  2 +-
 src/analysis/cktbindn.c |  2 +-
 src/analysis/cktbkdum.c |  2 +-
 src/analysis/cktclrbk.c |  4 ++--
 src/analysis/cktdest.c  |  8 ++++----
 src/analysis/cktdisto.c | 14 +++++++-------
 src/analysis/cktdump.c  |  2 +-
 src/analysis/cktfbran.c |  4 ++--
 src/analysis/cktfdev.c  |  6 +++---
 src/analysis/cktfnda.c  |  2 +-
 src/analysis/cktfndm.c  |  2 +-
 src/analysis/cktfnode.c |  2 +-
 src/analysis/cktgrnd.c  |  2 +-
 src/analysis/ckti2nod.c |  2 +-
 src/analysis/cktinit.c  |  4 ++--
 src/analysis/cktload.c  |  6 +++---
 src/analysis/cktmapn.c  |  2 +-
 src/analysis/cktmpar.c  |  2 +-
 src/analysis/cktnames.c |  8 ++++----
 src/analysis/cktneweq.c |  2 +-
 src/analysis/cktnewn.c  |  2 +-
 src/analysis/cktnodn.c  |  4 ++--
 src/analysis/cktntask.c |  3 ++-
 src/analysis/cktnum2n.c |  2 +-
 src/analysis/cktop.c    |  4 ++--
 src/analysis/cktparam.c |  2 +-
 src/analysis/cktpartn.c |  8 ++++----
 src/analysis/cktpzset.c |  2 +-
 src/analysis/cktsetap.c |  2 +-
 src/analysis/cktsetbk.c |  4 ++--
 src/analysis/cktsetup.c |  6 +++---
 src/analysis/cktsopt.c  |  2 +-
 src/analysis/ckttemp.c  |  4 ++--
 src/analysis/cktterr.c  |  6 +++---
 src/analysis/ckttrunc.c |  8 ++++----
 src/analysis/dcop.c     |  2 +-
 src/analysis/dctrcurv.c | 16 +++++++++-------
 src/analysis/dctsetp.c  |  2 +-
 src/analysis/distoan.c  |  4 ++--
 src/analysis/ninteg.c   |  2 +-
 src/analysis/noisean.c  | 10 ++--------
 src/analysis/tfanal.c   |  2 +-
 46 files changed, 97 insertions(+), 100 deletions(-)

diff --git a/src/analysis/acan.c b/src/analysis/acan.c
index ce15f7fce..906f8bd35 100644
--- a/src/analysis/acan.c
+++ b/src/analysis/acan.c
@@ -225,11 +225,11 @@ endsweep:
 
 
 int
-CKTacLoad(register CKTcircuit *ckt)
+CKTacLoad(CKTcircuit *ckt)
 {
     extern SPICEdev *DEVices[];
-    register int i;
-    register int size;
+    int i;
+    int size;
     int error;
 #ifdef PARALLEL_ARCH
     long type = MT_ACLOAD, length = 1;
diff --git a/src/analysis/cktaccpt.c b/src/analysis/cktaccpt.c
index fddbc5739..c7d959ca6 100644
--- a/src/analysis/cktaccpt.c
+++ b/src/analysis/cktaccpt.c
@@ -18,11 +18,11 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTaccept(register CKTcircuit *ckt)
+CKTaccept(CKTcircuit *ckt)
 {
     extern SPICEdev *DEVices[];
 
-    register int i;
+    int i;
     int error;
 
     for (i=0;i<DEVmaxnum;i++) {
diff --git a/src/analysis/cktacdum.c b/src/analysis/cktacdum.c
index 590ee65c8..041382c78 100644
--- a/src/analysis/cktacdum.c
+++ b/src/analysis/cktacdum.c
@@ -18,12 +18,12 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTacDump(register CKTcircuit *ckt, double freq, void *plot)
+CKTacDump(CKTcircuit *ckt, double freq, void *plot)
 {
-    register double *rhsold;
-    register double *irhsold;
-    register int i;
-    register IFcomplex *data;
+    double *rhsold;
+    double *irhsold;
+    int i;
+    IFcomplex *data;
     IFvalue freqData;
     IFvalue valueData;
 
diff --git a/src/analysis/cktask.c b/src/analysis/cktask.c
index f9230ca00..bd6df2405 100644
--- a/src/analysis/cktask.c
+++ b/src/analysis/cktask.c
@@ -20,7 +20,7 @@ extern SPICEdev *DEVices[];
 int
 CKTask(void *ckt, void *fast, int which, IFvalue *value, IFvalue *selector)
 {
-    register int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
+    int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
     int error;
 #ifdef PARALLEL_ARCH
     long msgtype, length;
diff --git a/src/analysis/cktaskaq.c b/src/analysis/cktaskaq.c
index 68ebb5ec5..8fecd3ee9 100644
--- a/src/analysis/cktaskaq.c
+++ b/src/analysis/cktaskaq.c
@@ -18,7 +18,7 @@ extern SPICEanalysis *analInfo[];
 int
 CKTaskAnalQ(void *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector)
 {
-    register int type = ((JOB *)analPtr)->JOBtype;
+    int type = ((JOB *)analPtr)->JOBtype;
 
     if((analInfo[type]->askQuest) == NULL) return(E_BADPARM);
     return( (*(analInfo[type]->askQuest))((CKTcircuit*)ckt,analPtr,parm,value));
diff --git a/src/analysis/cktbindn.c b/src/analysis/cktbindn.c
index b77e1da67..b21b5af45 100644
--- a/src/analysis/cktbindn.c
+++ b/src/analysis/cktbindn.c
@@ -24,7 +24,7 @@ int
 CKTbindNode(void *ckt, void *fast, int term, void *node)
 {
     int mappednode;
-    register int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
+    int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
 
     mappednode = ((CKTnode *)node)->number;
 
diff --git a/src/analysis/cktbkdum.c b/src/analysis/cktbkdum.c
index 265695928..41df6e80d 100644
--- a/src/analysis/cktbkdum.c
+++ b/src/analysis/cktbkdum.c
@@ -18,7 +18,7 @@ Author: 1985 Thomas L. Quarles
 void
 CKTbreakDump(CKTcircuit *ckt)
 {
-    register int i;
+    int i;
     for(i=0;i<ckt->CKTbreakSize;i++) {
         (void)printf("breakpoint table entry %d is %g\n",i,*(ckt->CKTbreaks+i));
     }
diff --git a/src/analysis/cktclrbk.c b/src/analysis/cktclrbk.c
index 36bbe9cc0..7d224bf6e 100644
--- a/src/analysis/cktclrbk.c
+++ b/src/analysis/cktclrbk.c
@@ -17,10 +17,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTclrBreak(register CKTcircuit *ckt)
+CKTclrBreak(CKTcircuit *ckt)
 {
     double *tmp;
-    register int j;
+    int j;
 
     if(ckt->CKTbreakSize >2) {
         tmp = (double *)MALLOC((ckt->CKTbreakSize-1)*sizeof(double));
diff --git a/src/analysis/cktdest.c b/src/analysis/cktdest.c
index ead8f3541..b372e95e1 100644
--- a/src/analysis/cktdest.c
+++ b/src/analysis/cktdest.c
@@ -24,10 +24,10 @@ extern SPICEdev *DEVices[];
 int
 CKTdestroy(void *inCkt)
 {
-    register CKTcircuit *ckt = (CKTcircuit *)inCkt;
-    register int i;
-    register CKTnode *node;
-    register CKTnode *nnode;
+    CKTcircuit *ckt = (CKTcircuit *)inCkt;
+    int i;
+    CKTnode *node;
+    CKTnode *nnode;
 
 
 #ifdef WANT_SENSE2
diff --git a/src/analysis/cktdisto.c b/src/analysis/cktdisto.c
index 137e7c8ac..5db0a4564 100644
--- a/src/analysis/cktdisto.c
+++ b/src/analysis/cktdisto.c
@@ -20,11 +20,11 @@ Author: 1988 Jaijeet S Roychowdhury
 
 
 int
-CKTdisto (register CKTcircuit *ckt, int mode)
+CKTdisto (CKTcircuit *ckt, int mode)
 {
     extern SPICEdev *DEVices[];
-    register DISTOAN* cv = (DISTOAN*) (ckt->CKTcurJob);
-    register int i;
+    DISTOAN* cv = (DISTOAN*) (ckt->CKTcurJob);
+    int i;
     int error=0;
     int size;
 
@@ -88,8 +88,8 @@ CKTdisto (register CKTcircuit *ckt, int mode)
 
         if(vcode >= 0) {
             /* voltage sources are in this version, so use them */
-            register VSRCinstance *here;
-            register VSRCmodel *model;
+            VSRCinstance *here;
+            VSRCmodel *model;
             for(model = (VSRCmodel *)ckt->CKThead[vcode];model != NULL;
                     model=model->VSRCnextModel){
                 for(here=model->VSRCinstances;here!=NULL;
@@ -123,8 +123,8 @@ if (((here->VSRCdF1given) && (mode == D_RHSF1)) ||
         }
         if(icode >= 0 ) {
             /* current sources are in this version, so use them */
-            register ISRCinstance *here;
-            register ISRCmodel *model;
+            ISRCinstance *here;
+            ISRCmodel *model;
 
             for(model= (ISRCmodel *)ckt->CKThead[icode];model != NULL;
                     model=model->ISRCnextModel){
diff --git a/src/analysis/cktdump.c b/src/analysis/cktdump.c
index 75ee9657d..3009428ac 100644
--- a/src/analysis/cktdump.c
+++ b/src/analysis/cktdump.c
@@ -17,7 +17,7 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-CKTdump(register CKTcircuit *ckt, double ref, void *plot)
+CKTdump(CKTcircuit *ckt, double ref, void *plot)
 {
     IFvalue refData;
     IFvalue valData;
diff --git a/src/analysis/cktfbran.c b/src/analysis/cktfbran.c
index c9ea291ac..b6d5d9fbf 100644
--- a/src/analysis/cktfbran.c
+++ b/src/analysis/cktfbran.c
@@ -19,11 +19,11 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTfndBranch(register CKTcircuit *ckt, IFuid name)
+CKTfndBranch(CKTcircuit *ckt, IFuid name)
 {
     extern SPICEdev *DEVices[];
 
-    register int i;
+    int i;
     int j;
 
     for (i=0;i<DEVmaxnum;i++) {
diff --git a/src/analysis/cktfdev.c b/src/analysis/cktfdev.c
index fd8109a8c..f28ef0695 100644
--- a/src/analysis/cktfdev.c
+++ b/src/analysis/cktfdev.c
@@ -14,9 +14,9 @@ Author: 1985 Thomas L. Quarles
 int
 CKTfndDev(void *Ckt, int *type, void **fast, IFuid name, void *modfast, IFuid modname)
 {
-    register CKTcircuit *ckt=(CKTcircuit *)Ckt;
-    register GENinstance *here;
-    register GENmodel *mods;
+    CKTcircuit *ckt=(CKTcircuit *)Ckt;
+    GENinstance *here;
+    GENmodel *mods;
 
     if((GENinstance **)fast != (GENinstance **)NULL && 
             *(GENinstance **)fast != (GENinstance *)NULL) {
diff --git a/src/analysis/cktfnda.c b/src/analysis/cktfnda.c
index 4b3fb3189..5e23e4544 100644
--- a/src/analysis/cktfnda.c
+++ b/src/analysis/cktfnda.c
@@ -24,7 +24,7 @@ int
 CKTfndAnal(void *ckt, int *analIndex, void **anal, IFuid name, void *inTask, IFuid taskName)
 {
     TSKtask *task = (TSKtask *)inTask;
-    register JOB *here;
+    JOB *here;
 
     for (here = ((TSKtask *)task)->jobs;here;here = here->JOBnextJob) {
         if(strcmp(here->JOBname,name)==0) {
diff --git a/src/analysis/cktfndm.c b/src/analysis/cktfndm.c
index 452952924..adee2262b 100644
--- a/src/analysis/cktfndm.c
+++ b/src/analysis/cktfndm.c
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTfndMod(void *ckt, int *type, void **modfast, IFuid modname)
 {
-    register GENmodel *mods;
+    GENmodel *mods;
 
     if(modfast != NULL && *(GENmodel **)modfast != NULL) {
         /* already have  modfast, so nothing to do */
diff --git a/src/analysis/cktfnode.c b/src/analysis/cktfnode.c
index 8cc3d8f34..b8b9082fe 100644
--- a/src/analysis/cktfnode.c
+++ b/src/analysis/cktfnode.c
@@ -21,7 +21,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTfndNode(void *ckt, void **node, IFuid name)
 {
-    register CKTnode *here;
+    CKTnode *here;
 
     for (here = ((CKTcircuit *)ckt)->CKTnodes; here; here = here->next)  {
         if(here->name == name) {
diff --git a/src/analysis/cktgrnd.c b/src/analysis/cktgrnd.c
index b154dc085..6c838ab9e 100644
--- a/src/analysis/cktgrnd.c
+++ b/src/analysis/cktgrnd.c
@@ -20,7 +20,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTground(void *inCkt, void **node, IFuid name)
 {
-    register CKTcircuit *ckt = (CKTcircuit *)inCkt;
+    CKTcircuit *ckt = (CKTcircuit *)inCkt;
 
     if(ckt->CKTnodes) {
         if(ckt->CKTnodes->name) {
diff --git a/src/analysis/ckti2nod.c b/src/analysis/ckti2nod.c
index 6726e21c1..cfaa7af99 100644
--- a/src/analysis/ckti2nod.c
+++ b/src/analysis/ckti2nod.c
@@ -26,7 +26,7 @@ int
 CKTinst2Node(void *ckt, void *instPtr, int terminal, void **node, IFuid *nodeName)
 {
     int nodenum;
-    register int type;
+    int type;
     CKTnode *here;
 
     type = ((GENinstance *)instPtr)->GENmodPtr->GENmodType;
diff --git a/src/analysis/cktinit.c b/src/analysis/cktinit.c
index 9db6958d7..d23cb37bd 100644
--- a/src/analysis/cktinit.c
+++ b/src/analysis/cktinit.c
@@ -15,8 +15,8 @@ int
 CKTinit(void **ckt)
                  /* new circuit to create */
 {
-    register int i;
-    register CKTcircuit *sckt;
+    int i;
+    CKTcircuit *sckt;
 
     sckt = (CKTcircuit *)( *ckt = (char *)MALLOC(sizeof(CKTcircuit)) );
     if(sckt == NULL) return(E_NOMEM);
diff --git a/src/analysis/cktload.c b/src/analysis/cktload.c
index bdab4f964..8510b8b02 100644
--- a/src/analysis/cktload.c
+++ b/src/analysis/cktload.c
@@ -22,11 +22,11 @@ Author: 1985 Thomas L. Quarles
 static int ZeroNoncurRow(SMPmatrix *matrix, CKTnode *nodes, int rownum);
 
 int
-CKTload(register CKTcircuit *ckt)
+CKTload(CKTcircuit *ckt)
 {
     extern SPICEdev *DEVices[];
-    register int i;
-    register int size;
+    int i;
+    int size;
     double startTime;
     CKTnode *node;
     int error;
diff --git a/src/analysis/cktmapn.c b/src/analysis/cktmapn.c
index 61077ea98..e01131dde 100644
--- a/src/analysis/cktmapn.c
+++ b/src/analysis/cktmapn.c
@@ -22,7 +22,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTmapNode(void *ckt, void **node, IFuid name)
 {
-    register CKTnode *here;
+    CKTnode *here;
     int error;
     IFuid uid;
     CKTnode *mynode;
diff --git a/src/analysis/cktmpar.c b/src/analysis/cktmpar.c
index 232db4d88..6ec6f79dd 100644
--- a/src/analysis/cktmpar.c
+++ b/src/analysis/cktmpar.c
@@ -21,7 +21,7 @@ extern SPICEdev *DEVices[];
 int
 CKTmodParam(void *ckt, void *modfast, int param, IFvalue *val, IFvalue *selector)
 {
-    register int type = ((GENmodel *)modfast)->GENmodType;
+    int type = ((GENmodel *)modfast)->GENmodType;
 
     if (((*DEVices[type]).DEVmodParam)) {
         return(((*((*DEVices[type]).DEVmodParam)) (param,val,
diff --git a/src/analysis/cktnames.c b/src/analysis/cktnames.c
index da0afb9b6..d3faa336b 100644
--- a/src/analysis/cktnames.c
+++ b/src/analysis/cktnames.c
@@ -17,10 +17,10 @@ Author: 1988 Thomas L. Quarles
 
 
 int
-CKTnames(register CKTcircuit *ckt, int *numNames, register IFuid **nameList)
+CKTnames(CKTcircuit *ckt, int *numNames, IFuid **nameList)
 {
-    register CKTnode *here;
-    register int i;
+    CKTnode *here;
+    int i;
     *numNames = ckt->CKTmaxEqNum-1;
     *nameList = (IFuid *)MALLOC(*numNames * sizeof(IFuid ));
     if ((*nameList) == (IFuid *)NULL) return(E_NOMEM);
@@ -35,7 +35,7 @@ int
 CKTdnames(CKTcircuit *ckt)
 {
     CKTnode *here;
-    register int i;
+    int i;
 
     i=0;
     for (here = ckt->CKTnodes->next; here; here = here->next)  {
diff --git a/src/analysis/cktneweq.c b/src/analysis/cktneweq.c
index 86009cb0f..0e597dd72 100644
--- a/src/analysis/cktneweq.c
+++ b/src/analysis/cktneweq.c
@@ -23,7 +23,7 @@ int
 CKTnewEq(void *inCkt, void **node, IFuid name)
 {
     CKTnode *mynode;
-    register CKTcircuit *ckt = (CKTcircuit *)inCkt;
+    CKTcircuit *ckt = (CKTcircuit *)inCkt;
     int error;
 
     error = CKTmkNode(ckt,&mynode);
diff --git a/src/analysis/cktnewn.c b/src/analysis/cktnewn.c
index 2b5505fd0..450dcf760 100644
--- a/src/analysis/cktnewn.c
+++ b/src/analysis/cktnewn.c
@@ -23,7 +23,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTnewNode(void *inCkt, void **node, IFuid name)
 {
-    register CKTcircuit *ckt = (CKTcircuit *)inCkt;
+    CKTcircuit *ckt = (CKTcircuit *)inCkt;
     if(!(ckt->CKTnodes)) { /*  starting the list - allocate both ground and 1 */
         ckt->CKTnodes = (CKTnode *) MALLOC(sizeof(CKTnode));
         if(ckt->CKTnodes == (CKTnode *)NULL) return(E_NOMEM);
diff --git a/src/analysis/cktnodn.c b/src/analysis/cktnodn.c
index 14f6db467..95cf75f0d 100644
--- a/src/analysis/cktnodn.c
+++ b/src/analysis/cktnodn.c
@@ -18,9 +18,9 @@ Author: 1985 Thomas L. Quarles
 
 
 IFuid
-CKTnodName(CKTcircuit *ckt, register int nodenum)
+CKTnodName(CKTcircuit *ckt, int nodenum)
 {
-    register CKTnode *here;
+    CKTnode *here;
 
     for(here = ckt->CKTnodes;here; here = here->next) {
         if(here->number == nodenum) { 
diff --git a/src/analysis/cktntask.c b/src/analysis/cktntask.c
index 0aa6e035c..1281df12a 100644
--- a/src/analysis/cktntask.c
+++ b/src/analysis/cktntask.c
@@ -17,7 +17,8 @@ Author: 1985 Thomas L. Quarles
 int
 CKTnewTask(void *ckt, void **taskPtr, IFuid taskName)
 {
-    register TSKtask *tsk;
+    TSKtask *tsk;
+
     *taskPtr = (void *)MALLOC(sizeof(TSKtask));
     if(*taskPtr==NULL) return(E_NOMEM);
     tsk = *(TSKtask **)taskPtr;
diff --git a/src/analysis/cktnum2n.c b/src/analysis/cktnum2n.c
index d9e8177fd..4869e7677 100644
--- a/src/analysis/cktnum2n.c
+++ b/src/analysis/cktnum2n.c
@@ -21,7 +21,7 @@ Author: 1985 Thomas L. Quarles
 CKTnode *
 CKTnum2nod(CKTcircuit *ckt, int node)
 {
-    register CKTnode *here;
+    CKTnode *here;
 
     for (here = ((CKTcircuit *)ckt)->CKTnodes; here; here = here->next)  {
         if(here->number == node) {
diff --git a/src/analysis/cktop.c b/src/analysis/cktop.c
index d68fc3e56..7eba90df2 100644
--- a/src/analysis/cktop.c
+++ b/src/analysis/cktop.c
@@ -104,10 +104,10 @@ CKTop(CKTcircuit *ckt, long int firstmode, long int continuemode, int iterlim)
  */
 
 int
-CKTconvTest(register CKTcircuit *ckt)
+CKTconvTest(CKTcircuit *ckt)
 {
     extern SPICEdev *DEVices[];
-    register int i;
+    int i;
     int error = OK;
 #ifdef PARALLEL_ARCH
     int ibuf[2];
diff --git a/src/analysis/cktparam.c b/src/analysis/cktparam.c
index 355598467..9c04af32f 100644
--- a/src/analysis/cktparam.c
+++ b/src/analysis/cktparam.c
@@ -22,7 +22,7 @@ extern SPICEdev *DEVices[];
 int
 CKTparam(void *ckt, void *fast, int param, IFvalue *val, IFvalue *selector)
 {
-    register int type;
+    int type;
     GENinstance *myfast = (GENinstance *)fast;
     type = myfast->GENmodPtr->GENmodType;
     if(((*DEVices[type]).DEVparam)) {
diff --git a/src/analysis/cktpartn.c b/src/analysis/cktpartn.c
index e912ac344..58876ddf4 100644
--- a/src/analysis/cktpartn.c
+++ b/src/analysis/cktpartn.c
@@ -21,11 +21,11 @@ Author: 1992 David A. Gates, UC Berkeley CADgroup
 extern SPICEdev *DEVices[];
 
 int
-CKTpartition(register CKTcircuit *ckt)
+CKTpartition(CKTcircuit *ckt)
 {
-    register int i, instNum = 0;
-    register GENmodel *model;
-    register GENinstance *inst;
+    int i, instNum = 0;
+    GENmodel *model;
+    GENinstance *inst;
 
     for (i=0;i<DEVmaxnum;i++) {
         if ( (ckt->CKThead[i] != NULL) ) {
diff --git a/src/analysis/cktpzset.c b/src/analysis/cktpzset.c
index d464f8e09..76eb06125 100644
--- a/src/analysis/cktpzset.c
+++ b/src/analysis/cktpzset.c
@@ -17,7 +17,7 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 
 
 int
-CKTpzSetup(register CKTcircuit *ckt, int type)
+CKTpzSetup(CKTcircuit *ckt, int type)
 {
     extern SPICEdev *DEVices[];
     PZAN *pzan = (PZAN *) ckt->CKTcurJob;
diff --git a/src/analysis/cktsetap.c b/src/analysis/cktsetap.c
index 657b670b1..f0c00e6f0 100644
--- a/src/analysis/cktsetap.c
+++ b/src/analysis/cktsetap.c
@@ -18,7 +18,7 @@ extern SPICEanalysis *analInfo[];
 int
 CKTsetAnalPm(void *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector)
 {
-    register int type = ((JOB *)analPtr)->JOBtype;
+    int type = ((JOB *)analPtr)->JOBtype;
     if((analInfo[type]->setParm)==NULL) return(E_BADPARM);
     return( (*(analInfo[type]->setParm))(ckt,analPtr,parm,value) );
 }
diff --git a/src/analysis/cktsetbk.c b/src/analysis/cktsetbk.c
index 77ed328a5..ec93909cc 100644
--- a/src/analysis/cktsetbk.c
+++ b/src/analysis/cktsetbk.c
@@ -18,10 +18,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CKTsetBreak(register CKTcircuit *ckt, double time)
+CKTsetBreak(CKTcircuit *ckt, double time)
 {
     double *tmp;
-    register int i,j;
+    int i,j;
 
     if(ckt->CKTtime > time) {
         (*(SPfrontEnd->IFerror))(ERR_PANIC,"breakpoint in the past - HELP!",
diff --git a/src/analysis/cktsetup.c b/src/analysis/cktsetup.c
index 096c0a78c..59343bc22 100644
--- a/src/analysis/cktsetup.c
+++ b/src/analysis/cktsetup.c
@@ -26,12 +26,12 @@ Author: 1985 Thomas L. Quarles
 extern SPICEdev *DEVices[];
 
 int
-CKTsetup(register CKTcircuit *ckt)
+CKTsetup(CKTcircuit *ckt)
 {
-    register int i;
+    int i;
     int error;
 
-    register SMPmatrix *matrix;
+    SMPmatrix *matrix;
     ckt->CKTnumStates=0;
 
 #ifdef WANT_SENSE2
diff --git a/src/analysis/cktsopt.c b/src/analysis/cktsopt.c
index eba172ad7..2e95da846 100644
--- a/src/analysis/cktsopt.c
+++ b/src/analysis/cktsopt.c
@@ -23,7 +23,7 @@ Author: 1985 Thomas L. Quarles
 int
 CKTsetOpt(void *ckt, void *anal, int opt, IFvalue *val)
 {
-    register TSKtask *task = (TSKtask *)anal;
+    TSKtask *task = (TSKtask *)anal;
 
     switch(opt) {
         
diff --git a/src/analysis/ckttemp.c b/src/analysis/ckttemp.c
index fa93cfda4..0be324dc1 100644
--- a/src/analysis/ckttemp.c
+++ b/src/analysis/ckttemp.c
@@ -22,10 +22,10 @@ Author: 1985 Thomas L. Quarles
 extern SPICEdev *DEVices[];
 
 int
-CKTtemp(register CKTcircuit *ckt)
+CKTtemp(CKTcircuit *ckt)
 {
     int error;
-    register int i;
+    int i;
 
     ckt->CKTvt = CONSTKoverQ * ckt->CKTtemp;
 
diff --git a/src/analysis/cktterr.c b/src/analysis/cktterr.c
index 6f3493c62..611c413de 100644
--- a/src/analysis/cktterr.c
+++ b/src/analysis/cktterr.c
@@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles
 #define ccap (qcap+1)
 
 void
-CKTterr(register int qcap, register CKTcircuit *ckt, register double *timeStep)
+CKTterr(int qcap, CKTcircuit *ckt, double *timeStep)
 { 
     double volttol;
     double chargetol;
@@ -21,8 +21,8 @@ CKTterr(register int qcap, register CKTcircuit *ckt, register double *timeStep)
     double diff[8];
     double deltmp[8];
     double factor;
-    register int i;
-    register int j;
+    int i;
+    int j;
     static double gearCoeff[] = {
         .5,
         .2222222222,
diff --git a/src/analysis/ckttrunc.c b/src/analysis/ckttrunc.c
index 3baed0e50..367a2f080 100644
--- a/src/analysis/ckttrunc.c
+++ b/src/analysis/ckttrunc.c
@@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
 extern SPICEdev *DEVices[];
 
 int
-CKTtrunc(register CKTcircuit *ckt, double *timeStep)
+CKTtrunc(CKTcircuit *ckt, double *timeStep)
 {
 #ifndef NEWTRUNC
-    register int i;
+    int i;
     double timetemp;
 #ifdef PARALLEL_ARCH
     long type = MT_TRUNC, length = 1;
@@ -66,8 +66,8 @@ CKTtrunc(register CKTcircuit *ckt, double *timeStep)
     ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
     return(OK);
 #else /* NEWTRUNC */
-    register int i;
-    register CKTnode *node;
+    int i;
+    CKTnode *node;
     double timetemp;
     double tmp;
     double diff;
diff --git a/src/analysis/dcop.c b/src/analysis/dcop.c
index 39d88f585..183b682c0 100644
--- a/src/analysis/dcop.c
+++ b/src/analysis/dcop.c
@@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
 int
 DCop(CKTcircuit *ckt)
 {
-    int CKTload(register CKTcircuit *ckt);
+    int CKTload(CKTcircuit *ckt);
     int converged;
     int error;
     IFuid *nameList;
diff --git a/src/analysis/dctrcurv.c b/src/analysis/dctrcurv.c
index 016e5a717..867a93bc8 100644
--- a/src/analysis/dctrcurv.c
+++ b/src/analysis/dctrcurv.c
@@ -21,7 +21,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
                 
                 /* forced restart flag */
 {
-    register TRCV* cv = (TRCV*)ckt->CKTcurJob; /* Where we get the job to do */ 
+    TRCV* cv = (TRCV*)ckt->CKTcurJob; /* Where we get the job to do */ 
     int i;
     double *temp;
     int converged;
@@ -68,8 +68,9 @@ DCtrCurv(CKTcircuit *ckt, int restart)
     for(i=0;i<=cv->TRCVnestLevel;i++) {
         if(rcode >= 0) {
             /* resistances are in this version, so use them */
-            register RESinstance *here;
-            register RESmodel *model;
+            RESinstance *here;
+            RESmodel *model;
+
             for(model = (RESmodel *)ckt->CKThead[rcode];model != NULL;
                     model=model->RESnextModel){
                 for(here=model->RESinstances;here!=NULL;
@@ -89,8 +90,9 @@ DCtrCurv(CKTcircuit *ckt, int restart)
         }
         if(vcode >= 0) {
             /* voltage sources are in this version, so use them */
-            register VSRCinstance *here;
-            register VSRCmodel *model;
+            VSRCinstance *here;
+            VSRCmodel *model;
+
             for(model = (VSRCmodel *)ckt->CKThead[vcode];model != NULL;
                     model=model->VSRCnextModel){
                 for(here=model->VSRCinstances;here!=NULL;
@@ -109,8 +111,8 @@ DCtrCurv(CKTcircuit *ckt, int restart)
         }
         if(icode >= 0 ) {
             /* current sources are in this version, so use them */
-            register ISRCinstance *here;
-            register ISRCmodel *model;
+            ISRCinstance *here;
+            ISRCmodel *model;
 
             for(model= (ISRCmodel *)ckt->CKThead[icode];model != NULL;
                     model=model->ISRCnextModel){
diff --git a/src/analysis/dctsetp.c b/src/analysis/dctsetp.c
index fc199ff12..d9dc3d063 100644
--- a/src/analysis/dctsetp.c
+++ b/src/analysis/dctsetp.c
@@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
 int 
 DCTsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value)
 {
-    register TRCV* cv= (TRCV*)anal;
+    TRCV* cv= (TRCV*)anal;
     switch(which) {
 
     case DCT_START1:
diff --git a/src/analysis/distoan.c b/src/analysis/distoan.c
index 9ab5c2dda..c7a978f87 100644
--- a/src/analysis/distoan.c
+++ b/src/analysis/distoan.c
@@ -39,7 +39,7 @@ DstorAlloc(double ***header, int size)
 extern int CKTdisto(CKTcircuit*, int);
 extern int DkerProc(int,double*,double*,int,DISTOan*);
 #else
-extern int CKTdisto(register CKTcircuit *ckt, int mode);
+extern int CKTdisto(CKTcircuit *ckt, int mode);
 extern int DkerProc(int type, double *rPtr, double *iPtr, int size, DISTOAN *job);
 #endif
 
@@ -59,7 +59,7 @@ DISTOan(CKTcircuit *ckt, int restart)
     IFuid *nameList;
     IFuid freqUid;
     void *acPlot;
-    register DISTOAN* job = (DISTOAN *) (ckt->CKTcurJob);
+    DISTOAN* job = (DISTOAN *) (ckt->CKTcurJob);
     static char *nof2src = "No source with f2 distortion input";
 #ifdef DISTODEBUG
     double time,time1;
diff --git a/src/analysis/ninteg.c b/src/analysis/ninteg.c
index b98832b02..4eeccab80 100644
--- a/src/analysis/ninteg.c
+++ b/src/analysis/ninteg.c
@@ -24,7 +24,7 @@ Author: 1987 Gary W. Ng
 
 
 double
-Nintegrate (double noizDens, double lnNdens, double lnNlstDens, register Ndata *data)
+Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data)
 {
     double exponent;
     double a;
diff --git a/src/analysis/noisean.c b/src/analysis/noisean.c
index efac07c0e..3dbbebbb5 100644
--- a/src/analysis/noisean.c
+++ b/src/analysis/noisean.c
@@ -1,14 +1,11 @@
 /* Patch to noisean.c by Richard D. McRoberts.
  * Patched with modifications from Weidong Lu (2000)
- * There is a strange #ifdef near the end of the file.
  */
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1987 Gary W. Ng
 **********/
 
-#define INT_NOISE /* Inserted to compile the ifdef'd code */
-
 #include "ngspice.h"
 #include <stdio.h>
 #include "acdefs.h"
@@ -22,7 +19,7 @@ Author: 1987 Gary W. Ng
 int
 NOISEan (CKTcircuit *ckt, int restart)
 {
-    register Ndata *data;
+    Ndata *data;
     double realVal;
     double imagVal;
     int error;
@@ -30,12 +27,11 @@ NOISEan (CKTcircuit *ckt, int restart)
     int negOutNode;
     int code;
     int step;
-    /* register CKTnode *node;  WL but not used ???? */
     IFuid freqUid;
     void *inst;  /* PN fixes incompatible pointer type warning */
     double freqTol; /* tolerence parameter for finding final frequency; hack */
 
-    register NOISEAN *job = (NOISEAN*) (ckt->CKTcurJob);
+    NOISEAN *job = (NOISEAN*) (ckt->CKTcurJob);
     static char *noacinput =    "noise input source has no AC value";
 
     posOutNode = ((CKTnode*) (job->output))->number;
@@ -258,7 +254,6 @@ NOISEan (CKTcircuit *ckt, int restart)
     error = CKTnoise(ckt,N_DENS,N_CLOSE,data);
     if (error) return(error);
 
-#ifdef INT_NOISE                  /* WL */
     data->numPlots = 0;
     data->outNumber = 0;
 
@@ -278,7 +273,6 @@ NOISEan (CKTcircuit *ckt, int restart)
 	error = CKTnoise(ckt,INT_NOIZ,N_CLOSE,data);
 	if (error) return(error);
     }
-#endif
 
     FREE(data);
     return(OK);
diff --git a/src/analysis/tfanal.c b/src/analysis/tfanal.c
index e6af2655f..cef6f6614 100644
--- a/src/analysis/tfanal.c
+++ b/src/analysis/tfanal.c
@@ -28,7 +28,7 @@ TFanal(CKTcircuit *ckt, int restart)
     IFvalue refval;     /* structure for 'reference' value (not used here) */
     int error;
     int converged;
-    register int i;
+    int i;
     void *plotptr;   /* pointer to out plot */
     void *ptr = NULL;
     IFuid uids[3];