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

Timestamp:

Mar 6, 2007, 2:17:48 PM (19 years ago)

Author:

Paul Price

Message:

Changing assertions to be more suitable.

File:

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

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-08 22:27:30 $
+ *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-07 00:17:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -87 +87 @@
                          unsigned int nChar)
 {
-    PS_ASSERT_PTR_NON_NULL(string, NULL);
-
     // Pass through NULL values
     if (!string) {
@@ -123 +121 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR_NON_NULL(format, 0);
+    PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
     va_list ap;
@@ -141 +139 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR_NON_NULL(format, 0);
+    PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
     size_t          length = 0;             // complete string length (sans \0)
@@ -194 +192 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR_NON_NULL(format, 0);
+    PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
     va_list ap;
@@ -213 +211 @@
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
-    PS_ASSERT_PTR_NON_NULL(format, 0);
+    PS_ASSERT_STRING_NON_EMPTY(format, 0);
 
     size_t          length;             // complete string length (sans \0)
@@ -275 +273 @@
                       bool multipleAreSignificant)
 {
-    PS_ASSERT_PTR_NON_NULL(splitters, NULL);
+    PS_ASSERT_STRING_NON_EMPTY(splitters, NULL);
 
     psList *values = psListAlloc(NULL); // The list of values to return