From 2ebe2d6277d513e1550c6542eb6ec41fa70ab1f3 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 1 May 2011 17:44:15 +0000
Subject: [PATCH] mop up, in the shadow of the last two commits

---
 ChangeLog                      |  3 +++
 src/spicelib/parser/inpaname.c |  6 ++----
 src/spicelib/parser/inpdpar.c  | 24 ++++++++++--------------
 src/spicelib/parser/inppname.c |  9 +++------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 196fc4051..153e8d458 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2011-05-01  Robert Larice
+ * src/spicelib/parser/inpaname.c ,
+ * src/spicelib/parser/inpdpar.c ,
+ * src/spicelib/parser/inppname.c ,
  * src/xspice/mif/mifgetmod.c :
     mop up, in the shadow of the last two commits
 
diff --git a/src/spicelib/parser/inpaname.c b/src/spicelib/parser/inpaname.c
index bc01c3797..8aee3a445 100644
--- a/src/spicelib/parser/inpaname.c
+++ b/src/spicelib/parser/inpaname.c
@@ -50,10 +50,8 @@ INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam,
      * parameter.
      */
     for (i = 0; i < *(sim->devices[*dev]->numInstanceParms); i++) {
-	if (strcmp(parm,
-		   sim->devices[*dev]->instanceParms[i].keyword) == 0
-	    && (sim->devices[*dev]->instanceParms[i].dataType &
-		IF_ASK)) {
+	if (strcmp(parm, sim->devices[*dev]->instanceParms[i].keyword) == 0
+	    && (sim->devices[*dev]->instanceParms[i].dataType & IF_ASK)) {
 	    /* found it, so we ask the question using the device info we got
 	     * above and put the results in the IFvalue structure our caller
 	     * gave us originally
diff --git a/src/spicelib/parser/inpdpar.c b/src/spicelib/parser/inpdpar.c
index c85bdab37..365716b33 100644
--- a/src/spicelib/parser/inpdpar.c
+++ b/src/spicelib/parser/inpdpar.c
@@ -43,35 +43,31 @@ char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
 	*waslead = 1;
     } else
 	*leading = 0.0;
-    while (**line != (char) 0) {
+    while (**line != '\0') {
 	error = INPgetTok(line, &parm, 1);
 	if (!*parm) {
 	    FREE(parm);
 	    continue;
 	}
 	if (error) {
-	    rtn  = (INPerror(error));
+	    rtn  = INPerror(error);
 	    goto quit;
 	}
 	for (i = 0; i < *(ft_sim->devices[dev]->numInstanceParms); i++) {
-	    if (strcmp(parm,
-		       ft_sim->devices[dev]->instanceParms[i].keyword) == 0) {
+	    if (strcmp(parm, ft_sim->devices[dev]->instanceParms[i].keyword) == 0) {
 		val =
 		    INPgetValue(ckt, line,
-				ft_sim->devices[dev]->
-				 instanceParms[i].dataType, tab);
+				ft_sim->devices[dev]->instanceParms[i].dataType,
+				tab);
 		if (!val) {
-		    rtn = (INPerror(E_PARMVAL));
+		    rtn = INPerror(E_PARMVAL);
 		    goto quit;
 		}
 		error = ft_sim->setInstanceParm (ckt, fast,
-						      ft_sim->devices
-						       [dev]->
-						      instanceParms[i].id,
-						      val,
-						      NULL);
+						 ft_sim->devices[dev]->instanceParms[i].id,
+						 val, NULL);
 		if (error) {
-		    rtn = (INPerror(error));
+		    rtn = INPerror(error);
 		    goto quit;
 		}
 		break;
@@ -80,7 +76,7 @@ char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
 	if (i == *(ft_sim->devices[dev]->numInstanceParms)) {
 	    errbuf = TMALLOC(char, strlen(parm) + 25);
 	    (void) sprintf(errbuf, " unknown parameter (%s) \n", parm);
-	    rtn = (errbuf);
+	    rtn = errbuf;
 	    goto quit;
 	}
 	FREE(parm);
diff --git a/src/spicelib/parser/inppname.c b/src/spicelib/parser/inppname.c
index 4db2cf369..b6a56e47b 100644
--- a/src/spicelib/parser/inppname.c
+++ b/src/spicelib/parser/inppname.c
@@ -28,14 +28,11 @@ int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *f
     int i;
 
     for (i = 0; i < *(ft_sim->devices[dev]->numInstanceParms); i++) {
-	if (strcmp(parm,
-		   ft_sim->devices[dev]->instanceParms[i].keyword) ==
-	    0) {
+	if (strcmp(parm, ft_sim->devices[dev]->instanceParms[i].keyword) == 0) {
 	    error =
 		ft_sim->setInstanceParm (ckt, fast,
-					      ft_sim->devices[dev]->
-					      instanceParms[i].id, val,
-					      NULL);
+					 ft_sim->devices[dev]->instanceParms[i].id,
+					 val, NULL);
 	    if (error)
 		return (error);
 	    break;