From fe68605770fa3888c4f224b390d8d23e694ededb Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 7 Jul 2010 17:28:29 +0000
Subject: [PATCH] use CKTcircuit instead of void*, #2/4

---
 ChangeLog                        | 8 ++++++++
 src/include/cktdefs.h            | 2 +-
 src/include/ifsim.h              | 2 +-
 src/spicelib/analysis/ckt.h      | 2 +-
 src/spicelib/analysis/cktaskaq.c | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f25cf03b6..855946f47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-07  Robert Larice
+ * src/include/cktdefs.h ,
+ * src/include/ifsim.h ,
+ * src/spicelib/analysis/ckt.h ,
+ * src/spicelib/analysis/cktaskaq.c :
+        the second of a series of four patches, which will change the code
+        to use the CKTcircuit type instead of the current mixed void*/char*
+
 2010-07-07  Robert Larice
  * src/tclspice.c ,
  * src/frontend/com_option.c ,
diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h
index b77f17028..90563e1ee 100644
--- a/src/include/cktdefs.h
+++ b/src/include/cktdefs.h
@@ -277,7 +277,7 @@ extern int CKTacLoad(CKTcircuit *);
 extern int CKTaccept(CKTcircuit *);
 extern int CKTacct(CKTcircuit *, void *, int , IFvalue *);
 extern int CKTask(void *, void *, int , IFvalue *, IFvalue *);
-extern int CKTaskAnalQ(void *, void *, int , IFvalue *, IFvalue *);
+extern int CKTaskAnalQ(CKTcircuit *, void *, int , IFvalue *, IFvalue *);
 extern int CKTaskNodQst(void *, void *, int , IFvalue *, IFvalue *);
 extern int CKTbindNode(void *, void *, int , void *);
 extern void CKTbreakDump(CKTcircuit *);
diff --git a/src/include/ifsim.h b/src/include/ifsim.h
index 753f8a420..381a44cf3 100644
--- a/src/include/ifsim.h
+++ b/src/include/ifsim.h
@@ -395,7 +395,7 @@ struct IFsimulator {
                                     /* create new analysis within a task */
     int (*setAnalysisParm) (CKTcircuit *, void *, int, IFvalue *, IFvalue *);
                                     /* set a parameter on an analysis  */
-    int (*askAnalysisQuest) (void *, void *, int, IFvalue *, IFvalue *);
+    int (*askAnalysisQuest) (CKTcircuit *, void *, int, IFvalue *, IFvalue *);
                                     /* ask a question about an analysis */
     int (*findAnalysis) (void *, int *, void **, IFuid, void *, IFuid);
                                     /* find a specific analysis */
diff --git a/src/spicelib/analysis/ckt.h b/src/spicelib/analysis/ckt.h
index 2be608a19..fc0e98060 100644
--- a/src/spicelib/analysis/ckt.h
+++ b/src/spicelib/analysis/ckt.h
@@ -19,7 +19,7 @@ int CKTacLoad( CKTcircuit *);
 int CKTaccept( CKTcircuit *);
 int CKTacct( CKTcircuit *, void *, int , IFvalue *);
 int CKTask( void *, void *, int , IFvalue *, IFvalue *);
-int CKTaskAnalQ( void *, void *, int , IFvalue *, IFvalue *);
+int CKTaskAnalQ( CKTcircuit *, void *, int , IFvalue *, IFvalue *);
 int CKTaskNodQst( void *, void *, int , IFvalue *, IFvalue *);
 int CKTbindNode( void *, void *, int , void *);
 void CKTbreakDump( CKTcircuit *);
diff --git a/src/spicelib/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c
index 1c6bcda3d..69a94ebca 100644
--- a/src/spicelib/analysis/cktaskaq.c
+++ b/src/spicelib/analysis/cktaskaq.c
@@ -16,10 +16,10 @@ extern SPICEanalysis *analInfo[];
 
 /* ARGSUSED */
 int
-CKTaskAnalQ(void *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector)
+CKTaskAnalQ(CKTcircuit *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector)
 {
     int type = ((JOB *)analPtr)->JOBtype;
 
     if((analInfo[type]->askQuest) == NULL) return(E_BADPARM);
-    return( (*(analInfo[type]->askQuest))((CKTcircuit*)ckt,analPtr,parm,value));
+    return( (*(analInfo[type]->askQuest))(ckt,analPtr,parm,value));
 }