Changeset 7251 for trunk/psLib/src/sys/psString.c

Timestamp:

May 31, 2006, 10:56:37 AM (20 years ago)

Author:

Paul Price

Message:

Removing commented-out code (old version of psStringSplit).

File:

• trunk/psLib/src/sys/psString.c (modified) (3 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-13 08:56:48 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-31 20:56:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -173 +173 @@
 }
 
-# if 0
-// XXX: This should probably be implemented using strpbrk
-// XXX : add a boolean "repeats significant"
-// XXX : NULL input string returns empty (not NULL) list
-// XXX : NULL splitters is an error
-psList *psStringSplit(const char *string,
-                      const char *splitters)
-{
-    PS_ASSERT_PTR_NON_NULL(splitters, NULL);
-
-    psList *values = psListAlloc(NULL); // The list of values to return
-    PS_ASSERT_PTR_NON_NULL(string, values);
-
-    unsigned int length = strlen(string); // The length of the string
-    unsigned int numSplitters = strlen(splitters); // Number of characters that might split
-    unsigned int start = 0;             // The position of the start of a word
-    for (int i = 1; i < length; i++) {
-        bool split = false;             // Is this character a splitter?
-        for (int j = 0; j < numSplitters && ! split; j++) {
-            if (string[i] == splitters[j]) {
-                split = true;
-            }
-        }
-        if (split) {
-            if (i == start) {
-                // Some idiot put in two spaces, or two commas or something
-                start++;
-            } else {
-                // We're at the end of the word
-                psString word = psStringNCopy(&string[start], i - start);
-                (void)psListAdd(values, PS_LIST_TAIL, word);
-                start = i + 1;
-                psFree(word);
-            }
-        }
-    }
-    if (start < length) {
-        // Copy the last word
-        psString word = psStringNCopy(&string[start], length - start);
-        (void)psListAdd(values, PS_LIST_TAIL, word);
-        psFree(word);
-    }
-
-    return values;
-}
-# endif
-
 // split the string by the given splitters
 // NULL input string returns empty (not NULL) list
@@ -230 +183 @@
 
     psList *values = psListAlloc(NULL); // The list of values to return
-    if (string == NULL)
+    // An input NULL string should not generate an error: it is a valid case
+    if (string == NULL) {
         return values;
-    // XXX this should not generate an error : it is a valid case
-    // PS_ASSERT_PTR_NON_NULL(string, values);
+    }
 
     char *next = NULL;