[Freedos-cvs] kernel/kernel config.c,1.67,1.68

[Bart O. <bar...@us...>]

Update of /cvsroot/freedos/kernel/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1876

Modified Files:
	config.c 
Log Message:
Misc small cleanups.


Index: config.c
===================================================================
RCS file: /cvsroot/freedos/kernel/kernel/config.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- config.c	23 Mar 2004 22:45:24 -0000	1.67
+++ config.c	26 Mar 2004 11:26:55 -0000	1.68
@@ -1526,9 +1526,14 @@
 }
 #endif
 
+STATIC int iswh(unsigned char c)
+{
+  return (c == '\r' || c == '\n' || c == '\t' || c == ' ');
+}
+
 STATIC BYTE * skipwh(BYTE * s)
 {
-  while (*s && (*s == 0x0d || *s == 0x0a || *s == ' ' || *s == '\t'))
+  while (iswh(*s))
     ++s;
   return s;
 }
@@ -1572,33 +1577,18 @@
     *d++ = *s++;
   }
   else
-    while (*s &&
-           !(*s == 0x0d
-             || *s == 0x0a || *s == ' ' || *s == '\t' || *s == '='))
+    while (*s && !iswh(*s) && *s != '=')
     {
       if (*s == '?')
-      {
         askThisSingleCommand = TRUE;
-        s++;
-      }
       else
-        *d++ = *s++;
+        *d++ = *s;
+      s++;
     }
   *d = '\0';
   return s;
 }
 
-#if 0
-BYTE *scan_seperator(BYTE * s, BYTE * d)
-{
-  s = skipwh(s);
-  if (*s)
-    *d++ = *s++;
-  *d = '\0';
-  return s;
-}
-#endif
-
 STATIC BOOL isnum(char ch)
 {
   return (ch >= '0' && ch <= '9');
@@ -1643,17 +1633,6 @@
   return (char *)p;
 }
 
-/* Yet another change for true portability (WDL)                        */
-#if 0
-STATIC COUNT tolower(COUNT c)
-{
-  if (c >= 'A' && c <= 'Z')
-    return (c + ('a' - 'A'));
-  else
-    return c;
-}
-#endif
-
 /* Yet another change for true portability (PJV) */
 STATIC COUNT toupper(COUNT c)
 {
@@ -1706,27 +1685,6 @@
   return d;
 }
 
-#if 0
-/* see if the second string is contained in the first one, ignoring case */
-STATIC char * stristr(char *s1, char *s2)
-{
-  int loop;
-
-  for (; *s1; s1++)
-    for (loop = 0;; loop++)
-    {
-      if (s2[loop] == 0)        /* found end of string 2 -> success */
-      {
-        return s1;              /* position where s2 was found */
-      }
-      if (toupper(s1[loop]) != toupper(s2[loop]))
-        break;
-    }
-
-  return NULL;
-}
-#endif
-
 /* compare two ASCII strings ignoring case */
 STATIC COUNT strcasecmp(REG BYTE * d, REG BYTE * s)
 {