From a3969da8273ef2b0adb8d51ea555b2fae9ed08ce Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 24 Jul 2011 17:20:46 +0000
Subject: [PATCH] polish saj's resume fix, use it for `acan' as well

---
 ChangeLog                        | 10 ++++++++++
 src/spicelib/analysis/acan.c     |  8 +++-----
 src/spicelib/analysis/dctran.c   | 13 +++----------
 src/spicelib/analysis/dctrcurv.c |  5 ++---
 src/spicelib/analysis/noisean.c  |  6 ++----
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6b310b2d..f06d731bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-24  Robert Larice
+ * src/spicelib/analysis/acan.c ,
+ * src/spicelib/analysis/dctran.c ,
+ * src/spicelib/analysis/dctrcurv.c ,
+ * src/spicelib/analysis/noisean.c :
+   polish saj's resume fix, use it for `acan' as well
+     saj's fix was applied 2003-07-23 19:36
+     avoid (non)-usage of uninitialized variables
+   FIXME, get rid of the `evil' number `666', find a better solution
+
 2011-07-24  Robert Larice
  * src/spicelib/analysis/noisean.c :
    bug fix, stepsize in `noisean'
diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c
index 73b2989b3..1df6ed020 100644
--- a/src/spicelib/analysis/acan.c
+++ b/src/spicelib/analysis/acan.c
@@ -179,11 +179,9 @@ ACan(CKTcircuit *ckt, int restart)
     } else {    /* continue previous analysis */
         freq = ((ACAN*)ckt->CKTcurJob)->ACsaveFreq;
         ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = 0; /* clear the 'old' frequency */
-	/* fix resume? saj*/
-	error = SPfrontEnd->OUTpBeginPlot (ckt,
-		ckt->CKTcurJob,
-                ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList,
-                IF_COMPLEX,&acPlot);
+	/* fix resume? saj, indeed !*/
+	error = SPfrontEnd->OUTpBeginPlot
+	    (NULL, NULL, NULL, NULL, 0, 666, NULL, 666, &acPlot);
 	/* saj*/    
     }
         
diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c
index ca9e05f9a..07a6a0fa0 100644
--- a/src/spicelib/analysis/dctran.c
+++ b/src/spicelib/analysis/dctran.c
@@ -346,16 +346,9 @@ DCtran(CKTcircuit *ckt,
         if(ckt->CKTminBreak==0) ckt->CKTminBreak=ckt->CKTmaxStep*5e-5;
         firsttime=0;
         /* To get rawfile working saj*/
-        /* get namelist again */
-        error = CKTnames(ckt,&numNames,&nameList);
-        if(error) return(error);
-        /* get timeUiD again */
-        SPfrontEnd->IFnewUid (ckt, &timeUid, NULL,
-                "time", UID_OTHER, NULL);
-        error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
-                 ckt->CKTcurJob->JOBname,timeUid,IF_REAL,666,nameList,
-                 666,&(((TRANan*)ckt->CKTcurJob)->TRANplot));/* magic 666 nums as flags */
-        tfree(nameList);
+        error = SPfrontEnd->OUTpBeginPlot
+            (NULL, NULL, NULL, NULL, 0, 666, NULL, 666,
+             &(((TRANan*)ckt->CKTcurJob)->TRANplot));
         if(error) {
             fprintf(stderr, "Couldn't relink rawfile\n");
             return error;
diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c
index 48e46eac3..b56d2a1bb 100644
--- a/src/spicelib/analysis/dctrcurv.c
+++ b/src/spicelib/analysis/dctrcurv.c
@@ -66,9 +66,8 @@ DCtrCurv(CKTcircuit *ckt, int restart)
         /* continuing */
         i = cv->TRCVnestState;
         /* resume to work? saj*/
-        error = SPfrontEnd->OUTpBeginPlot (ckt,
-           ckt->CKTcurJob, ckt->CKTcurJob->JOBname,
-           varUid,IF_REAL,666,nameList, 666,&plot);	
+        error = SPfrontEnd->OUTpBeginPlot
+            (NULL, NULL, NULL, NULL, 0, 666, NULL, 666, &plot);
         goto resume;
     }
     ckt->CKTtime = 0;
diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index 760583887..b8c7541bc 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -166,10 +166,8 @@ NOISEan (CKTcircuit *ckt, int restart)
 	data->outNoiz = job->NsavOnoise;
 	data->inNoise = job->NsavInoise;
 	/* saj resume rawfile fix*/
-	error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob,
-	   "Noise Spectral Density Curves - (V^2 or A^2)/Hz",
-	   freqUid,IF_REAL,666,data->namelist,666,
-	   &(data->NplotPtr));
+	error = SPfrontEnd->OUTpBeginPlot
+	    (NULL, NULL, NULL, NULL, 0, 666, NULL, 666, &(data->NplotPtr));
 	/*saj*/
     }