Removed spurious include for stdio.h.

ChangeLog

@@ -1,3 +1,8 @@
+2004-01-11  Paolo Nenzi <p.nenzi@ieee.org>
+
+	*   src/spicelib/analysis/*: Removed redundant includes. File stdio.h
+	    is already included via ngspice.h.
+
 2004-01-10  Paolo Nenzi <p.nenzi@ieee.org>
 
 	*   configure.in: changed version to rework-15pre2.

src/spicelib/analysis/acan.c

@@ -5,7 +5,6 @@ Modified 2001: AlansFixes
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "acdefs.h"
 #include "devdefs.h"

src/spicelib/analysis/acaskq.c

@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "acdefs.h"

src/spicelib/analysis/acsetp.c

@@ -4,8 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
-
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "acdefs.h"

src/spicelib/analysis/cktacct.c

@@ -15,7 +15,6 @@ Author: 1985 Thomas L. Quarles
 #include "const.h"
 #include "optdefs.h"
 #include "ifsim.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "spmatrix.h"
 

src/spicelib/analysis/cktacdum.c

@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "iferrmsg.h"

src/spicelib/analysis/cktaskaq.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktbkdum.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 
 

src/spicelib/analysis/cktclrbk.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "sperror.h"
 

src/spicelib/analysis/cktdelt.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"

src/spicelib/analysis/cktdest.c

@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "ifsim.h"

src/spicelib/analysis/cktdisto.c

@@ -16,7 +16,6 @@ Author: 1988 Jaijeet S Roychowdhury
 #include "iferrmsg.h"
 #include "distodef.h"
 #include "sperror.h"
-#include <stdio.h>
 
 
 int

src/spicelib/analysis/cktdlti.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/cktdltm.c

@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/cktfbran.c

@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 

src/spicelib/analysis/cktfnda.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "jobdefs.h"
 #include "tskdefs.h"

src/spicelib/analysis/cktfndm.c

@@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/cktfnode.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktftask.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/cktgrnd.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/ckti2nod.c

@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"
@@ -49,6 +48,12 @@ CKTinst2Node(void *ckt, void *instPtr, int terminal, void **node, IFuid *nodeNam
             case 5:
                 nodenum = ((GENinstance *)instPtr)->GENnode5;
                 break;
+	    case 6:
+                nodenum = ((GENinstance *)instPtr)->GENnode6;
+                break;
+	    case 7:
+                nodenum = ((GENinstance *)instPtr)->GENnode7;
+                break;	
         }
         /* ok, now we know its number, so we just have to find it.*/
         for(here = ((CKTcircuit*)ckt)->CKTnodes;here;here = here->next) {

src/spicelib/analysis/cktic.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "smpdefs.h"
 #include "sperror.h"

src/spicelib/analysis/cktlnkeq.c

@@ -9,7 +9,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "smpdefs.h"

src/spicelib/analysis/cktmapn.c

@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktmask.c

@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "devdefs.h"

src/spicelib/analysis/cktmcrt.c

@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "devdefs.h"
 #include "cktdefs.h"
 #include "sperror.h"

src/spicelib/analysis/cktmkcur.c

@@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktmkvol.c

@@ -4,12 +4,11 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 /* CKTmkVolt
- *  make the given name a 'node' of type current in the 
+ *  make the given name a 'node' of type voltage in the 
  * specified circuit
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktmpar.c

@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "devdefs.h"

src/spicelib/analysis/cktnames.c

@@ -10,7 +10,6 @@ Author: 1988 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"

src/spicelib/analysis/cktncdump.c

@@ -4,9 +4,7 @@ Author: 1999 Alan Gillespie
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
-#include "cktdefs.h"
-#include "suffix.h"
+#include "cktdefs.h"
#include "suffix.h"
 
 void
 CKTncDump(ckt) 

src/spicelib/analysis/cktnewan.c

@@ -4,8 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
-
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"

src/spicelib/analysis/cktneweq.c

@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "smpdefs.h"

src/spicelib/analysis/cktnewn.c

@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "smpdefs.h"

src/spicelib/analysis/cktnodn.c

@@ -12,11 +12,9 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 
 
-
 IFuid
 CKTnodName(CKTcircuit *ckt, int nodenum)
 {

src/spicelib/analysis/cktnoise.c

@@ -13,7 +13,6 @@ Author: 1987 Gary W. Ng
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "iferrmsg.h"

src/spicelib/analysis/cktnum2n.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "sperror.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktop.c

@@ -5,7 +5,6 @@ Modified: 2000  AlansFixes
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "devdefs.h"
 #include "sperror.h"

src/spicelib/analysis/cktparam.c

@@ -8,7 +8,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "devdefs.h"

src/spicelib/analysis/cktpartn.c

@@ -9,7 +9,6 @@ Author: 1992 David A. Gates, UC Berkeley CADgroup
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "const.h"

src/spicelib/analysis/cktpmnam.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
  */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "devdefs.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktpname.c

@@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "devdefs.h"
 #include "cktdefs.h"

src/spicelib/analysis/cktsetap.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "tskdefs.h"
 #include "jobdefs.h"
 #include "ifsim.h"

src/spicelib/analysis/cktsetbk.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/cktsetnp.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"

src/spicelib/analysis/ckttemp.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "smpdefs.h"
 #include "cktdefs.h"
 #include "const.h"

src/spicelib/analysis/cktterr.c

@@ -4,13 +4,11 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 
-
-
 #define ccap (qcap+1)
 
+
 void
 CKTterr(int qcap, CKTcircuit *ckt, double *timeStep)
 { 

src/spicelib/analysis/ckttroub.c

@@ -3,7 +3,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "trandefs.h"
 #include "cktdefs.h"
 #include "devdefs.h"

src/spicelib/analysis/ckttrunc.c

@@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
      */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "smpdefs.h"
 #include "devdefs.h"

src/spicelib/analysis/daskq.c

@@ -3,8 +3,7 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1988 Jaijeet S Roychowdhury
 **********/
 
-
-#include <stdio.h>
+#include "ngspice.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"

src/spicelib/analysis/dcoaskq.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "opdefs.h"

src/spicelib/analysis/dcop.c

@@ -5,7 +5,6 @@ Modified: 2000  AlansFixes
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "sperror.h"
 #include "ifsim.h"

src/spicelib/analysis/dcosetp.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"

src/spicelib/analysis/dctaskq.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trcvdefs.h"

src/spicelib/analysis/dctsetp.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trcvdefs.h"

src/spicelib/analysis/distoan.c

@@ -4,7 +4,6 @@ Author: 1988 Jaijeet S Roychowdhury
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "distodef.h"
 #include "sperror.h"

src/spicelib/analysis/dsetparm.c

@@ -4,7 +4,6 @@ Author: 1988 Jaijeet S Roychowdhury
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"

src/spicelib/analysis/naskq.c

@@ -4,7 +4,6 @@ Author: 1987 Gary W. Ng
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"

src/spicelib/analysis/ninteg.c

@@ -18,7 +18,6 @@ Author: 1987 Gary W. Ng
  *   Hence, the reason for the constant 'N_INTUSELOG'.
  */
 
-#include <stdio.h>
 #include "ngspice.h"
 #include "noisedef.h"
 

src/spicelib/analysis/nsetparm.c

@@ -4,7 +4,6 @@ Author: 1987 Gary W. Ng
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "iferrmsg.h"

src/spicelib/analysis/pzaskq.c

@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 
-#include <stdio.h>
+#include "ngspice.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "pzdefs.h"

src/spicelib/analysis/pzsetp.c

@@ -4,7 +4,7 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 
-#include <stdio.h>
+#include "ngspice.h"
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "pzdefs.h"

src/spicelib/analysis/sensaskq.c

@@ -3,7 +3,6 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"

src/spicelib/analysis/senssetp.c

@@ -3,7 +3,6 @@ Copyright 1991 Regents of the University of California.  All rights reserved.
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "cktdefs.h"

src/spicelib/analysis/tfanal.c

@@ -6,7 +6,6 @@ Author: 1988 Thomas L. Quarles
 /* subroutine to do DC Transfer Function analysis     */
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "cktdefs.h"
 #include "ifsim.h"
 #include "sperror.h"

src/spicelib/analysis/tfaskq.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trcvdefs.h"

src/spicelib/analysis/tfsetp.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "tfdefs.h"

src/spicelib/analysis/tranaskq.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trandefs.h"

src/spicelib/analysis/transetp.c

@@ -4,7 +4,6 @@ Author: 1985 Thomas L. Quarles
 **********/
 
 #include "ngspice.h"
-#include <stdio.h>
 #include "ifsim.h"
 #include "iferrmsg.h"
 #include "trandefs.h"