Changeset 8607

Timestamp:

Aug 25, 2006, 12:42:37 PM (20 years ago)

Author:

jhoblitt

Message:

add psStringPrependV()
change psStringPrepend() to use psStringPrependV()
cleanup param checking in psStringAppend() & psStringAppendV()

Location:

trunk/psLib/src/sys

Files:

• psString.c (modified) (7 diffs)
• psString.h (modified) (2 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-25 21:50:07 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-25 22:42:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -98 +98 @@
                        ...)
 {
+    PS_ASSERT_PTR_NON_NULL(dest, 0);
+    PS_ASSERT_PTR_NON_NULL(format, 0);
+
     va_list ap;
     va_start(ap, format);
@@ -110 +113 @@
                         va_list ap)
 {
+    PS_ASSERT_PTR_NON_NULL(dest, 0);
     PS_ASSERT_PTR_NON_NULL(format, 0);
+
     size_t          length;             // complete string length (sans \0)
     size_t          oldLength;          // original string length (sans \0)
     ssize_t         tailLength;         // length of string to append
-
-    if (!dest || !format) {
-        return 0;
-    }
 
     if (*dest) {
@@ -125 +126 @@
     }
 
+    va_list         apCopy;
+
     // find the size of the string to append
-    va_list         apCopy;
     // C99 guarentees vsnprintf() to work as expected with size = 0
     va_copy(apCopy, ap);
@@ -160 +162 @@
                         ...)
 {
+    PS_ASSERT_PTR_NON_NULL(dest, 0);
     PS_ASSERT_PTR_NON_NULL(format, 0);
-    va_list         args;
+
+    va_list ap;
+    va_start(ap, format);
+    ssize_t length = psStringPrependV(dest, format, ap);
+    va_end(ap);
+
+    return length;
+}
+
+ssize_t psStringPrependV(char **dest,
+                         const char *format,
+                         va_list ap)
+{
+    PS_ASSERT_PTR_NON_NULL(dest, 0);
+    PS_ASSERT_PTR_NON_NULL(format, 0);
+
     size_t          length;             // complete string length (sans \0)
     ssize_t         headLength;         // length of string to prepend
     char            *oldDest;           // copy of original string
-
-    if (!dest || !format) {
-        return 0;
-    }
 
     if (!*dest) {
@@ -179 +193 @@
     }
 
+    va_list apCopy;
+
     // find the size of the string to prepend
-    va_start(args, format);
     // C99 guarentees vsnprintf() to work as expected with size = 0
-    headLength = vsnprintf(*dest, 0, format, args);
-    va_end(args);
+    va_copy(apCopy, ap);
+    headLength = vsnprintf(*dest, 0, format, apCopy);
+    va_end(apCopy);
 
     // if the new head is zero length, return the length of the old string.  if
@@ -201 +217 @@
 
     // copy the new head to the beginning of string
-    va_start(args, format);
-    vsnprintf(*dest, length + 1, format, args);
-    va_end(args);
+    // XXX this second call to va_copy() isn't strictly nessicary as the
+    // calling function can't assume we won't modify the va_list.  However, we
+    // have decided to error on the side of caution.
+    va_copy(apCopy, ap);
+    vsnprintf(*dest, length + 1, format, apCopy);
+    va_end(apCopy);
 
     // append the original string

trunk/psLib/src/sys/psString.h

@@ -14 +14 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-25 21:49:47 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-25 22:42:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -127 +127 @@
 );
 
+/** Prepends a format onto a string
+ *
+ * This function shall allocate a new string if dest is NULL.  dest shall be
+ * automatically extended to the size of the new string.
+ *
+ * @return ssize_t:     The length of the new string (excluding '\0')
+ */
+ssize_t psStringPrependV(
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    va_list ap                          ///< va_list of format arguments
+);
+
 /** Procedure to split the input string into a psList of psStrings.
  *