From 927470e12f887842dee2f3be46679744b392a08c Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 6 Nov 2010 16:50:21 +0000
Subject: [PATCH] minor rewrite, avoid type conversion warnings

---
 ChangeLog                     | 5 +++++
 src/frontend/subckt.c         | 8 ++++++--
 src/spicelib/parser/inppas2.c | 3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c086db195..5bce26d71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-06  Robert Larice
+ * src/frontend/subckt.c ,
+ * src/spicelib/parser/inppas2.c :
+    minor rewrite, avoid type conversion warnings
+
 2010-11-06  Robert Larice
  * src/spicelib/devices/bsim1/b1.c ,
  * src/spicelib/devices/bsim1/b1dset.c ,
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 7ea18f219..a2c90b5ab 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -1491,7 +1491,9 @@ numnodes(char *name)
     while (*name && isspace(*name))
 	name++;
 
-    c = (isupper(*name) ? tolower(*name) : *name);
+    c = *name;
+    if(isupper(c))
+        c = (char) tolower(c);
 
     (void) strncpy(buf, name, sizeof(buf));
     s = buf;
@@ -1721,7 +1723,9 @@ devmodtranslate(struct line *deck, char *subname)
 
     while (*t && isspace(*t))
       t++;
-    c = isupper(*t) ? tolower(*t) : *t;  /* set c to first char in line. . . . */
+    c = *t;                           /* set c to first char in line. . . . */
+    if(isupper(c))
+        c = (char) tolower(c);
     found = FALSE;
     buffer = TMALLOC(char, strlen(t) + strlen(subname) + 4);
 
diff --git a/src/spicelib/parser/inppas2.c b/src/spicelib/parser/inppas2.c
index 1d101fbef..45b5ed424 100644
--- a/src/spicelib/parser/inppas2.c
+++ b/src/spicelib/parser/inppas2.c
@@ -91,7 +91,8 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
 #endif
 
 	c = *(current->line);
-	c = islower(c) ? toupper(c) : c;
+	if(islower(c))
+	    c = (char) toupper(c);
 
 	switch (c) {