From c178bdb059121c26eab5064bba0f5ef58a1ae847 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 30 Jun 2010 20:08:57 +0000
Subject: [PATCH] cosmetical changes

---
 ChangeLog                     | 6 ++++++
 src/frontend/com_ahelp.c      | 2 +-
 src/frontend/com_measure2.c   | 4 ++--
 src/include/inpptree.h        | 2 +-
 src/spicelib/parser/ptfuncs.c | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce7081139..715ed0a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-30  Robert Larice
+  * src/frontend/com_ahelp.c : drop NULL casting
+  * src/frontend/com_measure2.c : dont mix enum with integer
+  * src/include/inpptree.h : add parameter-names to a prototype
+  * src/spicelib/parser/ptfuncs.c : add casts to anonymous data
+
 2010-06-30  Holger Vogt
  * inpcom.c: no braces in let, set commands inside control loop
  * glob.c: reinstate {$var} expansion (patch by R. Larice)
diff --git a/src/frontend/com_ahelp.c b/src/frontend/com_ahelp.c
index 1f06d1d7e..d7ebfc397 100644
--- a/src/frontend/com_ahelp.c
+++ b/src/frontend/com_ahelp.c
@@ -62,7 +62,7 @@ com_ahelp(wordlist *wl)
 	"description of \"command\", type \"help command\".\n");
 
     /* sort the commands */
-    for (n = 0; cp_coms[n].co_func != (void (*)()) NULL; n++) {
+    for (n = 0; cp_coms[n].co_func != NULL; n++) {
 	cc[n] = &cp_coms[n];
     }
     qsort((char *) cc, n, sizeof(struct comm *), hcomp);
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index ffc0d8b0a..9e6f3de35 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -1213,10 +1213,10 @@ get_measure2(
    char *mName = NULL;             // name given to the measured output
    char *mFunction = NULL;
    int precision;          // measurement precision
-   int mFunctionType, wl_cnt;
+   ANALYSIS_TYPE_T mFunctionType = AT_UNKNOWN;
+   int wl_cnt;
    char *p;
 
-   mFunctionType = -1;
    *result = 0.0e0;        /* default result */
 
    if (!wl) {
diff --git a/src/include/inpptree.h b/src/include/inpptree.h
index a02d01a88..bd2f6220a 100644
--- a/src/include/inpptree.h
+++ b/src/include/inpptree.h
@@ -203,7 +203,7 @@ extern double PTle0(double arg);
 /* And in IFeval.c */
 
 #ifdef __STDC__
-extern int IFeval(IFparseTree *, double, double*, double*, double*);
+extern int IFeval(IFparseTree *tree, double gmin, double *result, double *vals, double *derivs);
 #else /* stdc */
 extern int IFeval();
 #endif /* stdc */
diff --git a/src/spicelib/parser/ptfuncs.c b/src/spicelib/parser/ptfuncs.c
index b6cc0d1b7..8e6e8bddd 100644
--- a/src/spicelib/parser/ptfuncs.c
+++ b/src/spicelib/parser/ptfuncs.c
@@ -294,7 +294,7 @@ PTuminus(double arg)
 double
 PTpwl(double arg, void *data)
 {
-  struct pwldata { int n; double *vals; } *thing = data;
+  struct pwldata { int n; double *vals; } *thing = (struct pwldata *) data;
 
   double y;
 
@@ -319,7 +319,7 @@ PTpwl(double arg, void *data)
 double
 PTpwl_derivative(double arg, void *data)
 {
-  struct pwldata { int n; double *vals; } *thing = data;
+  struct pwldata { int n; double *vals; } *thing = (struct pwldata *) data;
 
   double y;