From ff384526cc15eae70f90b4d64421094eee97f644 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 4 Oct 2014 18:24:05 +0200
Subject: [PATCH] cleanup, use proper type `runDesc' instead of passing void

---
 src/include/ngspice/lxt2_write.h   |  4 ++--
 src/spicelib/analysis/cktlxt2.c    |  3 +--
 src/spicelib/analysis/lxt2_init.c  | 11 ++++-------
 src/spicelib/analysis/lxt2_write.c |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/include/ngspice/lxt2_write.h b/src/include/ngspice/lxt2_write.h
index a15b1b809..65fe1b441 100644
--- a/src/include/ngspice/lxt2_write.h
+++ b/src/include/ngspice/lxt2_write.h
@@ -240,8 +240,8 @@ unsigned int chg[LXT2_WR_GRANULE_SIZE];
 #define LXT2_WR_SYM_F_WIRE         (1<<15)
 #define LXT2_WR_SYM_F_REG          (1<<16)
 
-void			lxt2_init(void *plotPtr);
-void			lxt2_end(void *plotPtr);
+void			lxt2_init(runDesc *run);
+void			lxt2_end(runDesc *run);
 
 			/* file I/O */
 struct lxt2_wr_trace *	lxt2_wr_init(const char *name);
diff --git a/src/spicelib/analysis/cktlxt2.c b/src/spicelib/analysis/cktlxt2.c
index 73196fdaf..17b2fb529 100644
--- a/src/spicelib/analysis/cktlxt2.c
+++ b/src/spicelib/analysis/cktlxt2.c
@@ -32,9 +32,8 @@
             return(E_NOMEM); \
     }
 
-void CKTemitlxt2(void *plotPtr)
+void CKTemitlxt2(runDesc *run)
 {
-    runDesc *run = (runDesc *) plotPtr;
     struct lxt2_wr_symbol  **trace_table;
     struct lxt2_wr_symbol  *trace;
     char *name;
diff --git a/src/spicelib/analysis/lxt2_init.c b/src/spicelib/analysis/lxt2_init.c
index 26f568c70..71ea6bedd 100644
--- a/src/spicelib/analysis/lxt2_init.c
+++ b/src/spicelib/analysis/lxt2_init.c
@@ -32,10 +32,9 @@
     }
 
 static void EVTtraceinit(CKTcircuit *ckt);
-static void KVLtraceinit(void *plotPtr);
+static void KVLtraceinit(runDesc *run);
 
-void lxt2_init(void *plotPtr) {
-    runDesc *run = (runDesc *)plotPtr;
+void lxt2_init(runDesc *run) {
 
     #ifdef LXT2_DEBUG
     printf("LXT2 lxt2_init\n");
@@ -56,9 +55,8 @@ void lxt2_init(void *plotPtr) {
     }
 }
 
-void lxt2_end(void *plotPtr)
+void lxt2_end(runDesc *run)
 {
-    runDesc *run = (runDesc *) plotPtr;
     if(run && run->circuit) {
       #ifdef LXT2_DEBUG
       printf("LXT2 final file flush.\n");
@@ -130,9 +128,8 @@ static void EVTtraceinit(CKTcircuit *ckt)       /* the circuit structure */
     ckt->lxt2.evt_num = num_nodes;
 }
 
-static void KVLtraceinit(void *plotPtr)   /* Call this after OUTpBeginPlot after all electrical run data is loaded */
+static void KVLtraceinit(runDesc *run)   /* Call this after OUTpBeginPlot after all electrical run data is loaded */
 {
-    runDesc *run = (runDesc *) plotPtr;
     struct lxt2_wr_symbol  **trace_table = NULL;
     int *kvl_indexmap = NULL;
     int i;
diff --git a/src/spicelib/analysis/lxt2_write.c b/src/spicelib/analysis/lxt2_write.c
index aa8ebb27f..2361498a5 100644
--- a/src/spicelib/analysis/lxt2_write.c
+++ b/src/spicelib/analysis/lxt2_write.c
@@ -24,7 +24,7 @@
 #pragma alloca
 #endif
 
-#include "ngspice/config.h"
+#include "ngspice/ngspice.h"
 #include "ngspice/lxt2_write.h"