From 0e1f5a29f7d592c51ee9c3598f2c7bc9a8c6abb5 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 17 Dec 2011 13:41:04 +0000
Subject: [PATCH] type fixes

---
 ChangeLog                       | 13 ++++++++++---
 src/frontend/breakp2.c          |  2 +-
 src/frontend/outitf.c           |  2 +-
 src/include/ngspice/ftedefs.h   |  2 +-
 src/spicelib/analysis/cktsens.c |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47157b244..c36ec93c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,23 @@
+2011-12-17  Robert Larice
+ * src/frontend/breakp2.c ,
+ * src/frontend/outitf.c ,
+ * src/include/ngspice/ftedefs.h ,
+ * src/spicelib/analysis/cktsens.c :
+  type fixes
+
 2011-12-17  Holger Vogt
  * src/frontend/inp.c,
    src/frontend/options.c
    src/include/ngspice/fteext.h :
    variable ft_stricterror to exit ngspice with exit code 1
-   if any error occurs during circuit parsing. 
+   if any error occurs during circuit parsing.
    Usage maybe extended to other errors.
    Tradditionally ngspice uses to continue, issue error messages,
    deliver wrong results and exit with exit code 0.
-   
+
 2011-12-16  Holger Vogt
  * src/frontend/subckt.c: beautify code
- 
+
 2011-12-15  Robert Larice
  * configure.ac ,
  * src/frontend/inpcom.c ,
diff --git a/src/frontend/breakp2.c b/src/frontend/breakp2.c
index e006dc662..b923e248e 100644
--- a/src/frontend/breakp2.c
+++ b/src/frontend/breakp2.c
@@ -117,7 +117,7 @@ ft_getSaves(struct save_info **savesp)
         if (d->db_type == DB_SAVE) {
             array[i].used = 0;
 	    if (d->db_analysis)
-		array[i].analysis = (IFuid *) copy(d->db_analysis);
+		array[i].analysis = copy(d->db_analysis);
 	    else
 		array[i].analysis = NULL;
             array[i++].name = copy(d->db_nodename1);
diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c
index bc95944b9..8407362f1 100644
--- a/src/frontend/outitf.c
+++ b/src/frontend/outitf.c
@@ -177,7 +177,7 @@ beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNam
         savesused = TMALLOC(bool, numsaves);
         saveall = FALSE;
         for (i = 0; i < numsaves; i++) {
-            if (saves[i].analysis && !cieq((char *)saves[i].analysis, an_name)) {
+            if (saves[i].analysis && !cieq(saves[i].analysis, an_name)) {
 		/* ignore this one this time around */
 		savesused[i] = TRUE; 
 		continue;
diff --git a/src/include/ngspice/ftedefs.h b/src/include/ngspice/ftedefs.h
index 15de882c6..968a7cbe4 100644
--- a/src/include/ngspice/ftedefs.h
+++ b/src/include/ngspice/ftedefs.h
@@ -19,7 +19,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 
 struct save_info {
     char	*name;
-    IFuid	*analysis;
+    IFuid	analysis;
     int		used;
 };
 
diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c
index 7f4084bce..c2dde79ed 100644
--- a/src/spicelib/analysis/cktsens.c
+++ b/src/spicelib/analysis/cktsens.c
@@ -81,7 +81,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
 	static int	is_dc;
 	int		k, j, n;
 	int		num_vars, branch_eq=0;
-	char		*sen_data=NULL;
+	void		*sen_data = NULL;
 	char		namebuf[513];
 	IFuid		*output_names, freq_name;
 	int		bypass;