auxiliary define `job' --> local variable `job'

14 years ago · fd9dec37a3
37 changed files with 40 additions and 36 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2011-12-11  Robert Larice
+ * src/spicelib/**/*.c :
+  auxiliary define `job' --> local variable `job'
+
 2011-12-11  Robert Larice
 * src/spicelib/**/*.c :
  auxiliary define (ANALYSIS*) ckt->CKTcurJob  -->  `job'
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@ -25,7 +25,7 @@ void SetAnalyse( char * Analyse, int Percent);
 int
 ACan(CKTcircuit *ckt, int restart)
 {
-    #define job ((ACAN *) ckt->CKTcurJob)
+    ACAN *job = (ACAN *) ckt->CKTcurJob;

    double freq;
    double freqTol; /* tolerence parameter for finding final frequency */
--- a/src/spicelib/analysis/cktnoise.c
+++ b/src/spicelib/analysis/cktnoise.c
@ -23,7 +23,7 @@ Author: 1987 Gary W. Ng
 int
 CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    double outNdens;
    int i;
--- a/src/spicelib/analysis/cktpzstr.c
+++ b/src/spicelib/analysis/cktpzstr.c
@ -518,7 +518,7 @@ int CKTpzStrat(PZtrial **set)
 int 
 CKTpzRunTrial(CKTcircuit *ckt, PZtrial **new_trialp, PZtrial **set)
 {
-    #define job ((PZAN *) ckt->CKTcurJob)
+    PZAN *job = (PZAN *) ckt->CKTcurJob;

    PZtrial	*match, *base, *new_trial;
    PZtrial	*p, *prev;
--- a/src/spicelib/analysis/dcpss.c
+++ b/src/spicelib/analysis/dcpss.c
@ -51,7 +51,7 @@ CKTfour(int, int, double *, double *, double *, double, double *, double *, doub
 int
 DCpss(CKTcircuit *ckt, int restart)
 {
-    #define job ((PSSan *) ckt->CKTcurJob)
+    PSSan *job = (PSSan *) ckt->CKTcurJob;

    int oscnNode;
    int i;
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@ -47,7 +47,7 @@ int
 DCtran(CKTcircuit *ckt,
       int restart)   /* forced restart flag */
 {
-    #define job ((TRANan *) ckt->CKTcurJob)
+    TRANan *job = (TRANan *) ckt->CKTcurJob;

    int i;
    double olddelta;
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@ -19,7 +19,7 @@ TFanal(CKTcircuit *ckt, int restart)
                    
                    /* forced restart flag */
 {
-    #define job ((TFan *) ckt->CKTcurJob)
+    TFan *job = (TFan *) ckt->CKTcurJob;

    int size;
    int insrc = 0, outsrc = 0;
--- a/src/spicelib/devices/bjt/bjtnoise.c
+++ b/src/spicelib/devices/bjt/bjtnoise.c
@ -25,7 +25,7 @@ int
 BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
          Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    BJTmodel *firstModel = (BJTmodel *) genmodel;
    BJTmodel *model;
--- a/src/spicelib/devices/bsim1/b1noi.c
+++ b/src/spicelib/devices/bsim1/b1noi.c
@ -24,7 +24,7 @@ int
 B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    B1model *firstModel = (B1model *) genmodel;
    B1model *model;
--- a/src/spicelib/devices/bsim2/b2noi.c
+++ b/src/spicelib/devices/bsim2/b2noi.c
@ -24,7 +24,7 @@ int
 B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    B2model *firstModel = (B2model *) genmodel;
    B2model *model;
--- a/src/spicelib/devices/bsim3/b3noi.c
+++ b/src/spicelib/devices/bsim3/b3noi.c
@ -108,7 +108,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM3model *model = (BSIM3model *)inModel;
 BSIM3instance *here;
--- a/src/spicelib/devices/bsim3soi/b4soinoi.c
+++ b/src/spicelib/devices/bsim3soi/b4soinoi.c
@ -104,7 +104,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 register B4SOImodel *model = (B4SOImodel *)inModel;
 register B4SOIinstance *here;
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c
@ -98,7 +98,7 @@ int
 B3SOIDDnoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
              Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 B3SOIDDmodel *model = (B3SOIDDmodel *)inModel;
 B3SOIDDinstance *here;
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c
@ -98,7 +98,7 @@ int
 B3SOIFDnoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
              Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 B3SOIFDmodel *model = (B3SOIFDmodel *)inModel;
 B3SOIFDinstance *here;
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c
@ -102,7 +102,7 @@ int
 B3SOIPDnoise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
              Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 B3SOIPDmodel *model = (B3SOIPDmodel *)inModel;
 B3SOIPDinstance *here;
--- a/src/spicelib/devices/bsim3v0/b3v0noi.c
+++ b/src/spicelib/devices/bsim3v0/b3v0noi.c
@ -72,7 +72,7 @@ int
 BSIM3v0noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
              Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM3v0model *model = (BSIM3v0model *)inModel;
 BSIM3v0instance *here;
--- a/src/spicelib/devices/bsim3v1/b3v1noi.c
+++ b/src/spicelib/devices/bsim3v1/b3v1noi.c
@ -95,7 +95,7 @@ int
 BSIM3v1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, 
              Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM3v1model *model = (BSIM3v1model *)inModel;
 BSIM3v1instance *here;
--- a/src/spicelib/devices/bsim3v32/b3v32noi.c
+++ b/src/spicelib/devices/bsim3v32/b3v32noi.c
@ -178,7 +178,7 @@ int
 BSIM3v32noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt,
 	    Ndata *data, double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM3v32model *model = (BSIM3v32model *)inModel;
 BSIM3v32instance *here;
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@ -87,7 +87,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM4model *model = (BSIM4model *)inModel;
 BSIM4instance *here;
--- a/src/spicelib/devices/bsim4v4/b4v4noi.c
+++ b/src/spicelib/devices/bsim4v4/b4v4noi.c
@ -112,7 +112,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM4v4model *model = (BSIM4v4model *)inModel;
 BSIM4v4instance *here;
--- a/src/spicelib/devices/bsim4v5/b4v5noi.c
+++ b/src/spicelib/devices/bsim4v5/b4v5noi.c
@ -82,7 +82,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM4v5model *model = (BSIM4v5model *)inModel;
 BSIM4v5instance *here;
--- a/src/spicelib/devices/bsim4v6/b4v6noi.c
+++ b/src/spicelib/devices/bsim4v6/b4v6noi.c
@ -83,7 +83,7 @@ CKTcircuit *ckt,
 Ndata *data,
 double *OnDens)
 {
-#define job ((NOISEAN*)ckt->CKTcurJob)
+NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

 BSIM4v6model *model = (BSIM4v6model *)inModel;
 BSIM4v6instance *here;
--- a/src/spicelib/devices/csw/cswnoise.c
+++ b/src/spicelib/devices/csw/cswnoise.c
@ -24,7 +24,7 @@ Author: 1987 Gary W. Ng
 int
 CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    CSWmodel *firstModel = (CSWmodel *) genmodel;
    CSWmodel *model;
--- a/src/spicelib/devices/dio/dionoise.c
+++ b/src/spicelib/devices/dio/dionoise.c
@ -26,7 +26,7 @@ int
 DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
          Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    DIOmodel *firstModel = (DIOmodel *) genmodel;
    DIOmodel *model;
--- a/src/spicelib/devices/hisim2/hsm2noi.c
+++ b/src/spicelib/devices/hisim2/hsm2noi.c
@ -39,7 +39,7 @@ int HSM2noise (
     register Ndata *data,
     double *OnDens)
 {
-  #define job ((NOISEAN*)ckt->CKTcurJob)
+  NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

  register HSM2model *model = (HSM2model *)inModel;
  register HSM2instance *here;
--- a/src/spicelib/devices/hisimhv/hsmhvnoi.c
+++ b/src/spicelib/devices/hisimhv/hsmhvnoi.c
@ -42,7 +42,7 @@ int HSMHVnoise (
     register Ndata *data,
     double *OnDens)
 {
-  #define job ((NOISEAN*)ckt->CKTcurJob)
+  NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

  register HSMHVmodel *model = (HSMHVmodel *)inModel;
  register HSMHVinstance *here;
--- a/src/spicelib/devices/jfet/jfetnoi.c
+++ b/src/spicelib/devices/jfet/jfetnoi.c
@ -24,7 +24,7 @@ int
 JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, 
           double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    JFETmodel *firstModel = (JFETmodel *) genmodel;
    JFETmodel *model;
--- a/src/spicelib/devices/jfet2/jfet2noi.c
+++ b/src/spicelib/devices/jfet2/jfet2noi.c
@ -27,7 +27,7 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
 int
 JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    JFET2model *firstModel = (JFET2model *) genmodel;
    JFET2model *model;
--- a/src/spicelib/devices/mes/mesnoise.c
+++ b/src/spicelib/devices/mes/mesnoise.c
@ -24,7 +24,7 @@ int
 MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data,
          double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    MESmodel *firstModel = (MESmodel *) genmodel;
    MESmodel *model;
--- a/src/spicelib/devices/mos1/mos1noi.c
+++ b/src/spicelib/devices/mos1/mos1noi.c
@ -25,7 +25,7 @@ int
 MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    MOS1model *firstModel = (MOS1model *) genmodel;
    MOS1model *model;
--- a/src/spicelib/devices/mos2/mos2noi.c
+++ b/src/spicelib/devices/mos2/mos2noi.c
@ -25,7 +25,7 @@ int
 MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    MOS2model *firstModel = (MOS2model *) genmodel;
    MOS2model *model;
--- a/src/spicelib/devices/mos3/mos3noi.c
+++ b/src/spicelib/devices/mos3/mos3noi.c
@ -25,7 +25,7 @@ int
 MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    MOS3model *firstModel = (MOS3model *) genmodel;
    MOS3model *model;
--- a/src/spicelib/devices/mos9/mos9noi.c
+++ b/src/spicelib/devices/mos9/mos9noi.c
@ -25,7 +25,7 @@ int
 MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
           Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    MOS9model *firstModel = (MOS9model *) genmodel;
    MOS9model *model;
--- a/src/spicelib/devices/res/resnoise.c
+++ b/src/spicelib/devices/res/resnoise.c
@ -30,7 +30,7 @@ int
 RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 
          Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    RESmodel *firstModel = (RESmodel *) genmodel;
    RESmodel *model;
--- a/src/spicelib/devices/soi3/soi3nois.c
+++ b/src/spicelib/devices/soi3/soi3nois.c
@ -44,7 +44,7 @@ SOI3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
           Ndata *data, double *OnDens)
    
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    SOI3model *firstModel = (SOI3model *) genmodel;
    SOI3model *model;
--- a/src/spicelib/devices/sw/swnoise.c
+++ b/src/spicelib/devices/sw/swnoise.c
@ -24,7 +24,7 @@ Author: 1987 Gary W. Ng
 int
 SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    SWmodel *firstModel = (SWmodel *) genmodel;
    SWmodel *model;
--- a/src/spicelib/devices/vbic/vbicnoise.c
+++ b/src/spicelib/devices/vbic/vbicnoise.c
@ -26,7 +26,7 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
 int
 VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
-    #define job ((NOISEAN*)ckt->CKTcurJob)
+    NOISEAN *job = (NOISEAN *) ckt->CKTcurJob;

    VBICmodel *firstModel = (VBICmodel *) genmodel;
    VBICmodel *model;