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

Timestamp:

Feb 8, 2007, 12:27:30 PM (19 years ago)

Author:

jhoblitt

Message:

change selected psString*() functions into wrappers so file/lineo/func can be recorded in the memBlock
whitespace cleanup

File:

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

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 23:52:54 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 22:27:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 #include "psMemory.h"
 
-
 static void stringFree(psString string)
 {
-    // There is non dynamic allocated item
-}
-
-psString psStringAlloc(long nChar)
+    // this function is only nessicary so psMemCheckString has a function
+    // pointer address to test against
+}
+
+
+psString p_psStringAlloc(const char *file,
+                         unsigned int lineno,
+                         const char *func,
+                         long nChar)
 {
     if (nChar < 1) {
         return NULL;
     }
-    psString string = psAlloc(nChar + 1);
+
+    psString string = p_psAlloc(file, lineno, func, nChar + 1);
     psMemSetDeallocator(string, (psFreeFunc)stringFree);
+
     return string;
 }
 
+
 bool psMemCheckString(psPtr ptr)
 {
     PS_ASSERT_PTR(ptr, false);
-    return ( psMemGetDeallocator(ptr) == (psFreeFunc)stringFree );
-}
-
-psString psStringCopy(const char *string)
+    return (psMemGetDeallocator(ptr) == (psFreeFunc)stringFree);
+}
+
+
+psString p_psStringCopy(const char *file,
+                        unsigned int lineno,
+                        const char *func,
+                        const char *string)
 {
     // Pass through NULL values!
@@ -61 +72 @@
         return NULL;
     }
-    psString output = psStringAlloc(strlen(string) + 1); // Output string
+
+    // Output string
+    psString output = p_psStringAlloc(file, lineno, func, strlen(string) + 1);
+
     // Copy input string to memory just allocated
     return strcpy(output, string);
 }
 
-psString psStringNCopy(const char *string,
-                       unsigned int nChar)
+
+psString p_psStringNCopy(const char *file,
+                         unsigned int lineno,
+                         const char *func,
+                         const char *string,
+                         unsigned int nChar)
 {
     PS_ASSERT_PTR_NON_NULL(string, NULL);
@@ -86 +104 @@
 
     // Copy input string to memory allocated up to nChar characters
-    psString output = psStringAlloc((size_t) nChar + 1);
+    psString output = p_psStringAlloc(file, lineno, func, (size_t) nChar + 1);
     output = strncpy(output, string, (size_t) nChar);
 
@@ -96 +114 @@
 }
 
-ssize_t psStringAppend(char **dest,
-                       const char *format,
-                       ...)
+
+ssize_t p_psStringAppend(const char *file,
+                         unsigned int lineno,
+                         const char *func,
+                         char **dest,
+                         const char *format,
+                         ...)
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
@@ -105 +127 @@
     va_list ap;
     va_start(ap, format);
-    ssize_t length = psStringAppendV(dest, format, ap);
+    ssize_t length = p_psStringAppendV(file, lineno, func, dest, format, ap);
     va_end(ap);
 
@@ -111 +133 @@
 }
 
-ssize_t psStringAppendV(char **dest,
-                        const char *format,
-                        va_list ap)
+ssize_t p_psStringAppendV(const char *file,
+                          unsigned int lineno,
+                          const char *func,
+                          char **dest,
+                          const char *format,
+                          va_list ap)
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
@@ -144 +169 @@
     // realloc string to string + tail + \0
     if (*dest) {
-        *dest = psRealloc(*dest, oldLength + tailLength + 1);
+        *dest = p_psRealloc(file, lineno, func, *dest, oldLength + tailLength + 1);
     } else {
-        *dest = psStringAlloc(oldLength + tailLength + 1);
+        *dest = p_psStringAlloc(file, lineno, func, oldLength + tailLength + 1);
     }
 
@@ -160 +185 @@
 }
 
-ssize_t psStringPrepend(char **dest,
-                        const char *format,
-                        ...)
+
+ssize_t p_psStringPrepend(const char *file,
+                          unsigned int lineno,
+                          const char *func,
+                          char **dest,
+                          const char *format,
+                          ...)
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
@@ -169 +198 @@
     va_list ap;
     va_start(ap, format);
-    ssize_t length = psStringPrependV(dest, format, ap);
+    ssize_t length = p_psStringPrependV(file, lineno, func, dest, format, ap);
     va_end(ap);
 
@@ -175 +204 @@
 }
 
-ssize_t psStringPrependV(char **dest,
-                         const char *format,
-                         va_list ap)
+
+ssize_t p_psStringPrependV(const char *file,
+                           unsigned int lineno,
+                           const char *func,
+                           char **dest,
+                           const char *format,
+                           va_list ap)
 {
     PS_ASSERT_PTR_NON_NULL(dest, 0);
@@ -188 +221 @@
     if (!*dest) {
         // makes the string backup and concatination pointless
-        *dest = psStringCopy("");
+        *dest = p_psStringCopy(file, lineno, func, "");
         length = 0;
     } else {
@@ -210 +243 @@
 
     // backup original string
-    oldDest = psStringCopy(*dest);
+    oldDest = p_psStringCopy(file, lineno, func, *dest);
 
     // new string length (sans \0)
@@ -216 +249 @@
 
     // realloc string to head + string + \0
-    *dest = psRealloc(*dest, length + 1);
+    *dest = p_psRealloc(file, lineno, func, *dest, length + 1);
 
     // copy the new head to the beginning of string
@@ -234 +267 @@
 }
 
+
 // split the string by the given splitters
 // NULL input string returns empty (not NULL) list
@@ -276 +310 @@
     return values;
 }
+
 
 // given the input string, search for all copies of the key, and replace with the replacement value
@@ -343 +378 @@
 }
 
+
 psArray *psStringSplitArray(const char *string, const char *splitters, bool multi)
 {
@@ -352 +388 @@
 }
 
+
 #ifndef whitespace
 #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
@@ -376 +413 @@
     return i;
 }
+
+
 /*
  * Used by PS_FILE_LINE