Applied initial patches for wx2.8 compatibility

[ctsim.git] / libctsupport / strfuncs.cpp

diff --git a/libctsupport/strfuncs.cpp b/libctsupport/strfuncs.cpp
index 414faea91ddd541dce972495867418359e163aac..228dca94ae13687fa179df135cfd0b8cf487fcd7 100644 (file)
--- a/libctsupport/strfuncs.cpp
+++ b/libctsupport/strfuncs.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: strfuncs.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $
+**  $Id$
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -23,23 +23,23 @@
 
 
 /* NAME
- *     str_skip_head                   Skip leading characters of string
+ *      str_skip_head                   Skip leading characters of string
  *
  * SYNOPSIS
- *     shortened = str_skip_head (str, charlist)
- *  OUT        shortened                       Start of shortened string
- *  IN char *str                       String to have beginning skipped
- *  IN char *charlist                  List of characters to skip over
+ *      shortened = str_skip_head (str, charlist)
+ *  OUT shortened                       Start of shortened string
+ *  IN  char *str                       String to have beginning skipped
+ *  IN  char *charlist                  List of characters to skip over
  *
  * NOTES
- *         This routine returns the position in a string (str) of the
- *     first character that is not in an specified string of characters
- *     (charlist).
+ *          This routine returns the position in a string (str) of the
+ *      first character that is not in an specified string of characters
+ *      (charlist).
  */
 
 
 char*
-str_skip_head (const char* str, const char* const charlist) 
+str_skip_head (const char* str, const char* const charlist)
 {
   const char* p = str;
 
@@ -50,7 +50,7 @@ str_skip_head (const char* str, const char* const charlist)
 }
 
 char*
-str_skip_head (const char* str, char* charlist) 
+str_skip_head (const char* str, char* charlist)
 {
   const char* p = str;
 
@@ -62,33 +62,33 @@ str_skip_head (const char* str, char* charlist)
 
 
 /* NAME
- *     str_lower                       Convert a string to lower case
+ *      str_lower                       Convert a string to lower case
  *
  * SYNOPSIS
- *     str  = str_lower (str)
- *     char *str                       String to be converted
+ *      str  = str_lower (str)
+ *      char *str                       String to be converted
  */
 
 char *
 str_lower (char *s)
 {
     char *p = s;
-    
-    while (*p) {                       /* while (*p != EOS) */
-       *p = tolower(*p);
-       ++p;
+
+    while (*p) {                        /* while (*p != EOS) */
+        *p = tolower(*p);
+        ++p;
     }
 
     return (s);
 }
 
 /* NAME
- *     str_rm_tail                     Remove characters from end of string
+ *      str_rm_tail                     Remove characters from end of string
  *
  * SYNOPSIS
- *     str = str_rm_tail (str, charlist)
- *     char *str                       String to have end removed
-k *    char *charlist                  List of characters to remove from string
+ *      str = str_rm_tail (str, charlist)
+ *      char *str                       String to have end removed
+k *     char *charlist                  List of characters to remove from string
  *
  */
 
@@ -97,22 +97,22 @@ char *
 str_rm_tail (char *str, const char* const charlist)
 {
   int i;
-  
+
   for (i = strlen(str) - 1; i >= 0; i--)
     if (strchr (charlist, str[i]) != NULL)
       str[i] = EOS;
     else
-      break;           /* found non-specified char, all done */
+      break;            /* found non-specified char, all done */
 
   return (str);
 }
 
 /* NAME
- *     str_wrm_tail                    Remove white space from end of string
+ *      str_wrm_tail                    Remove white space from end of string
  *
  * SYNOPSIS
- *     str = str_wrm_tail (str)
- *     char *str                       String to have white space removed
+ *      str = str_wrm_tail (str)
+ *      char *str                       String to have white space removed
  *
  */
 
@@ -123,11 +123,11 @@ str_wrm_tail (char *str)
 }
 
 /* NAME
- *     str_upper                       Convert a string to upper case
+ *      str_upper                       Convert a string to upper case
  *
  * SYNOPSIS
- *     str  = str_upper (str)
- *     char *str                       String to be converted
+ *      str  = str_upper (str)
+ *      char *str                       String to be converted
  */
 
 char *
@@ -135,7 +135,7 @@ str_upper (char *s)
 {
   char *p = s;
 
-  while (*p) {                 /* while (*s != EOS) */
+  while (*p) {                  /* while (*s != EOS) */
     *p = toupper(*p);
     p++;
   }
@@ -145,7 +145,7 @@ str_upper (char *s)
 
 
 #ifdef TEST
-int 
+int
 main (void)
 {
   string str, clist;
@@ -158,9 +158,9 @@ main (void)
   printf ("Enter list of characters to be skipped -- ");
   gets (clist);
   printf ("\n");
-  
+
   skip = str_skip_head (str, clist);
-  
+
   printf ("Shortened string = '%s'\n", skip);
 }
 #endif