Changeset 12512 for trunk/psLib/test/sys/tap_psString.c

Timestamp:

Mar 19, 2007, 5:31:39 PM (19 years ago)

Author:

jhoblitt

Message:

silence warnings

File:

• trunk/psLib/test/sys/tap_psString.c (modified) (6 diffs)

trunk/psLib/test/sys/tap_psString.c

@@ -20 +20 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-03-03 02:43:37 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-03-20 03:31:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 psS32 testNULLStrings(void);
 psS32 testStrCheck(void);
-
-static const char* const NullString = "";
 
 
@@ -311 +309 @@
     diag("testStrAppend03");
 
-    char *str=NULL;
-    int result;
-
-    str = psStringCopy(STR_0);
+    char *str =psStringCopy(STR_0);
 
     // test null-op
-    psStringAppend(&str, NullString);
-    result = strcmp(str, STR_0);
-    ok ( result == 0, "Failed test point str=[%s]\n", str);
+    psStringAppend(&str, "%s", "");
+    ok_str(str, STR_0, "Failed test point");
     psFree(str);
 
@@ -391 +385 @@
 
     // test null-op
-    psStringPrepend(&str, NullString);
+    psStringPrepend(&str, "%s", "");
     result = strcmp(str, STR_0);
     ok ( result == 0, "test point str=[%s]\n", str);
@@ -531 +525 @@
 psS32 testNULLStrings(void)
 {
-    diag("testNULLStrings");
+    diag("test""s");
 
     psString nullTest = NULL;
@@ -550 +544 @@
 
     //psStringAppend should return 0 for NULL input destination
-    outSize = psStringAppend(nullDest, NullString);
+    outSize = psStringAppend(nullDest, "%s", "");
     ok (outSize == 0,
         "psStringAppend to return 0 for NULL input destination.\n");