Changeset 7115

Timestamp:

May 12, 2006, 10:56:48 PM (20 years ago)

Author:

magnier

Message:

dropped error message for NULL input string in psStringSplit

Location:

trunk/psLib

Files:

• src/sys/psString.c (modified) (2 diffs)
• test/sys/tst_psString.c (modified) (3 diffs)
• test/sys/verified/tst_psString.stderr (modified) (2 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 00:57:07 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-13 08:56:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -230 +230 @@
 
     psList *values = psListAlloc(NULL); // The list of values to return
-    PS_ASSERT_PTR_NON_NULL(string, values);
+    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;

trunk/psLib/test/sys/tst_psString.c

@@ -20 +20 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-05-02 23:55:53 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-05-13 08:56:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -463 +463 @@
     psFree(strList);
     strList = NULL;
-    //Return NULL for NULL string input
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    //Return empty list for NULL string input
+    //psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     strList = psStringSplit(NULL, split, true);
     //    if (strList != NULL) {
@@ -684 +684 @@
         return 4;
     }
-    //psStringSplit should return NULL for NULL input string
+    //psStringSplit should return empty list for NULL input string
     psList *nullList = NULL;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    // psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     nullList = psStringSplit(nullTest, ",", true);
     //    if (nullList != NULL) {

trunk/psLib/test/sys/verified/tst_psString.stderr

@@ -146 +146 @@
     Following should generate error message
 <DATE><TIME>|<HOST>|E|psStringSplit (FILE:LINENO)
-    Unallowable operation: string is NULL.
-<DATE><TIME>|<HOST>|I|testStrSplit00
-    Following should generate error message
-<DATE><TIME>|<HOST>|E|psStringSplit (FILE:LINENO)
     Unallowable operation: splitters is NULL.
 
@@ -179 +175 @@
     Following should generate error message
 <DATE><TIME>|<HOST>|E|psStringSplit (FILE:LINENO)
-    Unallowable operation: string is NULL.
-<DATE><TIME>|<HOST>|I|testNULLStrings
-    Following should generate error message
-<DATE><TIME>|<HOST>|E|psStringSplit (FILE:LINENO)
     Unallowable operation: splitters is NULL.