From 6349bc4fbf2e12c2e32ca4119a83b6d6c6f87928 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 19 Feb 2011 14:54:00 +0000
Subject: [PATCH] numparm, un-pascal-ify, use '\r' '\n' '\t'

---
 ChangeLog                        | 5 +++++
 src/frontend/numparam/mystring.c | 5 ++---
 src/frontend/numparam/nupatest.c | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a7b0a938..e103f76c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-19  Robert Larice
+ * src/frontend/numparam/mystring.c ,
+ * src/frontend/numparam/nupatest.c :
+    numparm, un-pascal-ify, use '\r' '\n' '\t'
+
 2011-02-19  Robert Larice
  * src/frontend/numparam/general.h ,
  * src/frontend/numparam/mystring.c :
diff --git a/src/frontend/numparam/mystring.c b/src/frontend/numparam/mystring.c
index 362e86cf2..f156528eb 100644
--- a/src/frontend/numparam/mystring.c
+++ b/src/frontend/numparam/mystring.c
@@ -78,8 +78,7 @@ rs ( SPICE_DSTRINGPTR dstr_p)
         c = fgetc (stdin);
         cadd (dstr_p, c);
     }
-    while (!((c == Cr) || (c == '\n')));
-    /* return i */ ;
+    while (!((c == '\r') || (c == '\n')));
 }
 
 char
@@ -594,7 +593,7 @@ freadstr (FILE * f, SPICE_DSTRINGPTR dstr_p)
     do
     {
         c = fgetc (f);		/*  tab is the only control char accepted */
-        if (((c >= ' ') || (c < 0) || (c == Tab)))
+        if (((c >= ' ') || (c < 0) || (c == '\t')))
         {
             str_load[0] = c;
             spice_dstring_append( dstr_p, str_load, 1 ) ;
diff --git a/src/frontend/numparam/nupatest.c b/src/frontend/numparam/nupatest.c
index dfb5ecc73..b54e5ae92 100644
--- a/src/frontend/numparam/nupatest.c
+++ b/src/frontend/numparam/nupatest.c
@@ -157,7 +157,7 @@ void rs(char * s) /*  78 coumn limit */
     if ( (c>=' ')&&(c<='~') && (i<max) ) { 
       cadd(s,c); Inc(i); 
     }
-    done= (c==Lf) || (c==Cr);
+    done= (c=='\n') || (c=='\r');
   }
 }
 #endif