From 21a31ab2c2180e6088687ee3ea88916967d88081 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 6 Nov 2010 17:39:18 +0000
Subject: [PATCH] tiny rewrite, make use of strtolower() and strtoupper()

---
 ChangeLog                        | 10 ++++++++++
 src/frontend/numparam/spicenum.c |  4 +---
 src/frontend/parse.c             |  6 ++----
 src/frontend/typesdef.c          |  7 ++++---
 src/frontend/vectors.c           | 12 +++---------
 src/spicelib/parser/inpptree.c   | 12 ++++--------
 src/xspice/evt/evtplot.c         |  6 +-----
 src/xspice/ipc/ipc.c             | 16 ++--------------
 8 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2753bead1..64cfb94c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-06  Robert Larice
+ * src/frontend/parse.c ,
+ * src/frontend/typesdef.c ,
+ * src/frontend/vectors.c ,
+ * src/frontend/numparam/spicenum.c ,
+ * src/spicelib/parser/inpptree.c ,
+ * src/xspice/evt/evtplot.c ,
+ * src/xspice/ipc/ipc.c :
+    tiny rewrite, make use of strtolower() and strtoupper()
+
 2010-11-06  Robert Larice
  * src/frontend/parser/input.c :
     tiny rewrite, type fixes
diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index 462481a35..31108a69c 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -828,7 +828,6 @@ nupa_eval (char *s, int linenum, int orig_linenum)
 {
   int idef;			/* subckt definition line */
   char c, keep, *ptr;
-  unsigned int i;
   SPICE_DSTRING subname ;	/* dynamic string for subcircuit name */
   bool err = 1;
 
@@ -858,8 +857,7 @@ nupa_eval (char *s, int linenum, int orig_linenum)
       *nupa_inst_name = 'x';
       *ptr = keep;
 
-      for (i = 0; i < strlen (nupa_inst_name); i++)
-	nupa_inst_name[i] = toupper (nupa_inst_name[i]);
+      strtoupper(nupa_inst_name);
 
       idef = findsubckt (dicoS, s, &subname);
       if (idef > 0)
diff --git a/src/frontend/parse.c b/src/frontend/parse.c
index b36ddb9be..5876362cd 100644
--- a/src/frontend/parse.c
+++ b/src/frontend/parse.c
@@ -256,12 +256,10 @@ mkfnode(const char *func, struct pnode *arg)
     struct func *f;
     struct pnode *p, *q;
     struct dvec *d;
-    char buf[BSIZE_SP], *s;
+    char buf[BSIZE_SP];
 
     (void) strcpy(buf, func);
-    for (s = buf; *s; s++)      /* Make sure the case is ok. */
-        if (isupper(*s))
-            *s = tolower(*s);
+    strtolower(buf);  /* Make sure the case is ok. */
     for (f = &ft_funcs[0]; f->fu_name; f++)
         if (eq(f->fu_name, buf))
             break;
diff --git a/src/frontend/typesdef.c b/src/frontend/typesdef.c
index 1cf3abb21..afa2ed93d 100644
--- a/src/frontend/typesdef.c
+++ b/src/frontend/typesdef.c
@@ -200,9 +200,10 @@ ft_plotabbrev(char *string)
 
     if (!string)
         return (NULL);
-    for (i = 0; string[i]; i++)
-        buf[i] = isupper(string[i]) ? tolower(string[i]) : string[i];
-    buf[i] = '\0';
+
+    strncpy(buf, string, sizeof(buf));
+    buf[sizeof(buf) - 1] = '\0';
+    strtolower(buf);
 
     for (i = 0; plotabs[i].p_name; i++)
         if (substring(plotabs[i].p_pattern, buf))
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index d40c0b693..ef185e603 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -313,16 +313,12 @@ vec_fromplot(char *word, struct plot *plot)
     d = findvec(word, plot);
     if (!d) {
         (void) strcpy(buf, word);
-        for (s = buf; *s; s++)
-            if (isupper(*s))
-                *s = tolower(*s);
+        strtolower(buf);
         d = findvec(buf, plot);
     }
     if (!d) {
         (void) strcpy(buf, word);
-        for (s = buf; *s; s++)
-            if (islower(*s))
-                *s = *s - 'a' + 'A';
+        strtoupper(buf);
         d = findvec(buf, plot);
     }
 
@@ -869,9 +865,7 @@ vec_basename(struct dvec *v)
     } else
         (void) strcpy(buf, v->v_name);
     
-    for (t = buf; *t; t++)
-        if (isupper(*t))
-            *t = tolower(*t);
+    strtolower(buf);
     for (t = buf; isspace(*t); t++)
         ;
     s = t;
diff --git a/src/spicelib/parser/inpptree.c b/src/spicelib/parser/inpptree.c
index 528eda9ef..f032f3464 100644
--- a/src/spicelib/parser/inpptree.c
+++ b/src/spicelib/parser/inpptree.c
@@ -831,14 +831,12 @@ static INPparseNode *mkfnode(const char *fname, INPparseNode * arg)
 {
     int i;
     INPparseNode *p;
-    char buf[128], *name, *s;
+    char buf[128], *name;
     CKTnode *temp;
 
     /* Make sure the case is ok. */
     (void) strcpy(buf, fname);
-    for (s = buf; *s; s++)
-	if (isupper(*s))
-	    *s = tolower(*s);
+    strtolower(buf);
 
     p = TMALLOC(INPparseNode, 1);
 
@@ -971,14 +969,12 @@ static INPparseNode *mknnode(double number)
 static INPparseNode *mksnode(const char *string, void *ckt)
 {
     int i, j;
-    char buf[128], *s;
+    char buf[128];
     INPparseNode *p;
 
     /* Make sure the case is ok. */
     (void) strcpy(buf, string);
-    for (s = buf; *s; s++)
-	if (isupper(*s))
-	    *s = tolower(*s);
+    strtolower(buf);
 
     p = TMALLOC(INPparseNode, 1);
 
diff --git a/src/xspice/evt/evtplot.c b/src/xspice/evt/evtplot.c
index 24f73e399..d88a6e296 100755
--- a/src/xspice/evt/evtplot.c
+++ b/src/xspice/evt/evtplot.c
@@ -87,7 +87,6 @@ struct dvec *EVTfindvec(
   char *ptr;
 
   int  i;
-  int  len;
   int  num_nodes;
   int  udn_index;
   int  num_events;
@@ -118,10 +117,7 @@ struct dvec *EVTfindvec(
   name = MIFcopy(node);
 
   /* Convert to all lower case */
-  len = (int) strlen(name);
-  for(i = 0; i < len; i++)
-    if(isupper(name[i]))
-      name[i] = tolower(name[i]);
+  strtolower(name);
 
   /* Divide into the node name and member name */
   for(ptr = name; *ptr != '\0'; ptr++)
diff --git a/src/xspice/ipc/ipc.c b/src/xspice/ipc/ipc.c
index d408bb49e..33fc40733 100755
--- a/src/xspice/ipc/ipc.c
+++ b/src/xspice/ipc/ipc.c
@@ -836,9 +836,7 @@ ipc_send_double (
      char               *tag,    /* The node or instance */
      double             value )  /* The data value to send */
 {
-   int i;
    int len = 0;
-   int fmt_buffer_len;
            
    switch (protocol) {
    case IPC_PROTOCOL_V1:
@@ -847,11 +845,7 @@ ipc_send_double (
       strcat (fmt_buffer, " ");
 
       /* If talking to Mentor tools, must force upper case for Mspice 7.0 */
-      fmt_buffer_len = strlen(fmt_buffer);
-      for(i = 0; i < fmt_buffer_len; i++) {
-          if(islower(fmt_buffer[i]))
-              fmt_buffer[i] = toupper(fmt_buffer[i]);
-      }
+      strtoupper(fmt_buffer);
 
       len = stuff_binary_v1 (value, 0.0, 1, fmt_buffer, strlen(fmt_buffer));
       break;
@@ -877,9 +871,7 @@ ipc_send_complex (
      char               *tag,    /* The node or instance */
      Ipc_Complex_t      value )  /* The data value to send */
 {
-   int i;
    int len=0;
-   int fmt_buffer_len;
            
    switch (protocol) {
    case IPC_PROTOCOL_V1:
@@ -888,11 +880,7 @@ ipc_send_complex (
       strcat (fmt_buffer, " ");
 
       /* If talking to Mentor tools, must force upper case for Mspice 7.0 */
-      fmt_buffer_len = strlen(fmt_buffer);
-      for(i = 0; i < fmt_buffer_len; i++) {
-          if(islower(fmt_buffer[i]))
-              fmt_buffer[i] = toupper(fmt_buffer[i]);
-      }
+      strtoupper(fmt_buffer);
 
       len = stuff_binary_v1 (value.real, value.imag, 2, fmt_buffer,
                              strlen(fmt_buffer));