From a03bd669f9c573f38bb7cf36c57782770d6897ff Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Tue, 20 Jan 2004 13:04:36 +0000
Subject: [PATCH] Code clean up.

---
 src/spicelib/devices/cccs/cccs.c     |  1 -
 src/spicelib/devices/cccs/cccsask.c  |  8 +-------
 src/spicelib/devices/cccs/cccsdel.c  |  7 +------
 src/spicelib/devices/cccs/cccsdest.c |  4 +---
 src/spicelib/devices/cccs/cccsext.h  | 17 ++---------------
 src/spicelib/devices/cccs/cccsload.c |  6 +-----
 src/spicelib/devices/cccs/cccsmdel.c |  7 +------
 src/spicelib/devices/cccs/cccspar.c  |  7 +------
 src/spicelib/devices/cccs/cccspzld.c |  7 +------
 src/spicelib/devices/cccs/cccssacl.c |  5 +----
 src/spicelib/devices/cccs/cccsset.c  |  7 +------
 src/spicelib/devices/cccs/cccssld.c  |  5 +----
 src/spicelib/devices/cccs/cccssprt.c |  5 +----
 src/spicelib/devices/cccs/cccssset.c |  5 +----
 14 files changed, 14 insertions(+), 77 deletions(-)

diff --git a/src/spicelib/devices/cccs/cccs.c b/src/spicelib/devices/cccs/cccs.c
index e85bc345f..16b5e2d61 100644
--- a/src/spicelib/devices/cccs/cccs.c
+++ b/src/spicelib/devices/cccs/cccs.c
@@ -4,7 +4,6 @@ Author: 1987 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "devdefs.h"
 #include "cccsdefs.h"
diff --git a/src/spicelib/devices/cccs/cccsask.c b/src/spicelib/devices/cccs/cccsask.c
index 314ab850f..6b9438156 100644
--- a/src/spicelib/devices/cccs/cccsask.c
+++ b/src/spicelib/devices/cccs/cccsask.c
@@ -9,7 +9,6 @@ Author: 1987
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "ifsim.h"
@@ -20,12 +19,7 @@ Author: 1987
 
 /* ARGSUSED */
 int
-CCCSask(ckt,inst,which,value,select)
-    CKTcircuit *ckt;
-    GENinstance *inst;
-    int which;
-    IFvalue *value;
-    IFvalue *select;
+CCCSask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
 {
     CCCSinstance *here = (CCCSinstance*)inst;
     double vr;
diff --git a/src/spicelib/devices/cccs/cccsdel.c b/src/spicelib/devices/cccs/cccsdel.c
index d3cdd1099..0917f4195 100644
--- a/src/spicelib/devices/cccs/cccsdel.c
+++ b/src/spicelib/devices/cccs/cccsdel.c
@@ -6,18 +6,13 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cccsdefs.h"
 #include "sperror.h"
 #include "suffix.h"
 
 
 int
-CCCSdelete(inModel,name,inst)
-    GENmodel *inModel;
-    IFuid name;
-    GENinstance **inst;
-
+CCCSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
 {
 
     CCCSmodel *model = (CCCSmodel*)inModel;
diff --git a/src/spicelib/devices/cccs/cccsdest.c b/src/spicelib/devices/cccs/cccsdest.c
index 799f7d2d9..dfe7980f5 100644
--- a/src/spicelib/devices/cccs/cccsdest.c
+++ b/src/spicelib/devices/cccs/cccsdest.c
@@ -6,14 +6,12 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cccsdefs.h"
 #include "suffix.h"
 
 
 void
-CCCSdestroy(inModel)
-    GENmodel **inModel;
+CCCSdestroy(GENmodel **inModel)
 
 {
     CCCSmodel **model = (CCCSmodel**)inModel;
diff --git a/src/spicelib/devices/cccs/cccsext.h b/src/spicelib/devices/cccs/cccsext.h
index 003cd0bf8..5a8934518 100644
--- a/src/spicelib/devices/cccs/cccsext.h
+++ b/src/spicelib/devices/cccs/cccsext.h
@@ -3,7 +3,7 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifdef __STDC__
+
 extern int CCCSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
 extern int CCCSdelete(GENmodel*,IFuid,GENinstance**);
 extern void CCCSdestroy(GENmodel**);
@@ -16,17 +16,4 @@ extern int CCCSsLoad(GENmodel*,CKTcircuit*);
 extern void CCCSsPrint(GENmodel*,CKTcircuit*);
 extern int CCCSsSetup(SENstruct*,GENmodel*);
 extern int CCCSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
-#else /* stdc */
-extern int CCCSask();
-extern int CCCSdelete();
-extern void CCCSdestroy();
-extern int CCCSload();
-extern int CCCSmDelete();
-extern int CCCSparam();
-extern int CCCSpzLoad();
-extern int CCCSsAcLoad();
-extern int CCCSsLoad();
-extern void CCCSsPrint();
-extern int CCCSsSetup();
-extern int CCCSsetup();
-#endif /* stdc */
+
diff --git a/src/spicelib/devices/cccs/cccsload.c b/src/spicelib/devices/cccs/cccsload.c
index c9d387d1e..534c1e55a 100644
--- a/src/spicelib/devices/cccs/cccsload.c
+++ b/src/spicelib/devices/cccs/cccsload.c
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "cccsdefs.h"
 #include "sperror.h"
@@ -15,10 +14,7 @@ Author: 1985 Thomas L. Quarles
 
 /*ARGSUSED*/
 int
-CCCSload(inModel,ckt)
-
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+CCCSload(GENmodel *inModel, CKTcircuit *ckt)
 
         /* actually load the current voltage value into the 
          * sparse matrix previously provided 
diff --git a/src/spicelib/devices/cccs/cccsmdel.c b/src/spicelib/devices/cccs/cccsmdel.c
index a0648cf79..76b743077 100644
--- a/src/spicelib/devices/cccs/cccsmdel.c
+++ b/src/spicelib/devices/cccs/cccsmdel.c
@@ -6,18 +6,13 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cccsdefs.h"
 #include "sperror.h"
 #include "suffix.h"
 
 
 int
-CCCSmDelete(inModel,modname,kill)
-    GENmodel **inModel;
-    IFuid modname;
-    GENmodel *kill;
-
+CCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
 
     CCCSmodel **model = (CCCSmodel**)inModel;
diff --git a/src/spicelib/devices/cccs/cccspar.c b/src/spicelib/devices/cccs/cccspar.c
index 8047eee87..87a742550 100644
--- a/src/spicelib/devices/cccs/cccspar.c
+++ b/src/spicelib/devices/cccs/cccspar.c
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "cccsdefs.h"
 #include "sperror.h"
@@ -15,11 +14,7 @@ Author: 1985 Thomas L. Quarles
 
 /* ARGSUSED */
 int
-CCCSparam(param,value,inst,select)
-    int param;
-    IFvalue *value;
-    GENinstance *inst;
-    IFvalue *select;
+CCCSparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     CCCSinstance *here = (CCCSinstance*)inst;
     switch(param) {
diff --git a/src/spicelib/devices/cccs/cccspzld.c b/src/spicelib/devices/cccs/cccspzld.c
index 535d545c3..78676d143 100644
--- a/src/spicelib/devices/cccs/cccspzld.c
+++ b/src/spicelib/devices/cccs/cccspzld.c
@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "complex.h"
 #include "sperror.h"
@@ -16,11 +15,7 @@ Author: 1985 Thomas L. Quarles
 
 /*ARGSUSED*/
 int
-CCCSpzLoad(inModel,ckt,s)
-
-    GENmodel *inModel;
-    CKTcircuit *ckt;
-    SPcomplex *s;
+CCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 
         /* actually load the current voltage value into the 
          * sparse matrix previously provided 
diff --git a/src/spicelib/devices/cccs/cccssacl.c b/src/spicelib/devices/cccs/cccssacl.c
index bbf80e6de..4bd7aa22a 100644
--- a/src/spicelib/devices/cccs/cccssacl.c
+++ b/src/spicelib/devices/cccs/cccssacl.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "cccsdefs.h"
@@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CCCSsAcLoad(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+CCCSsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
diff --git a/src/spicelib/devices/cccs/cccsset.c b/src/spicelib/devices/cccs/cccsset.c
index 26c274f15..672428752 100644
--- a/src/spicelib/devices/cccs/cccsset.c
+++ b/src/spicelib/devices/cccs/cccsset.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "cccsdefs.h"
@@ -20,11 +19,7 @@ Author: 1985 Thomas L. Quarles
 
 /*ARGSUSED*/
 int
-CCCSsetup(matrix,inModel,ckt,states)
-    SMPmatrix *matrix;
-    GENmodel *inModel;
-    CKTcircuit *ckt;
-    int *states;
+CCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
 {
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
diff --git a/src/spicelib/devices/cccs/cccssld.c b/src/spicelib/devices/cccs/cccssld.c
index a3bae935c..9536402e3 100644
--- a/src/spicelib/devices/cccs/cccssld.c
+++ b/src/spicelib/devices/cccs/cccssld.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "cccsdefs.h"
@@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CCCSsLoad(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+CCCSsLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
diff --git a/src/spicelib/devices/cccs/cccssprt.c b/src/spicelib/devices/cccs/cccssprt.c
index 500fcf548..1b0bdfd4a 100644
--- a/src/spicelib/devices/cccs/cccssprt.c
+++ b/src/spicelib/devices/cccs/cccssprt.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "cccsdefs.h"
@@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
 
 
 void
-CCCSsPrint(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+CCCSsPrint(GENmodel *inModel, CKTcircuit *ckt)
 {
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;
diff --git a/src/spicelib/devices/cccs/cccssset.c b/src/spicelib/devices/cccs/cccssset.c
index 6b537aed7..a44158900 100644
--- a/src/spicelib/devices/cccs/cccssset.c
+++ b/src/spicelib/devices/cccs/cccssset.c
@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "cccsdefs.h"
@@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CCCSsSetup(info,inModel)
-    SENstruct *info;
-    GENmodel *inModel;
+CCCSsSetup(SENstruct *info, GENmodel *inModel)
 {
     CCCSmodel *model = (CCCSmodel*)inModel;
     CCCSinstance *here;