Index: trunk/psLib/src/sys/psString.h
===================================================================
--- trunk/psLib/src/sys/psString.h	(revision 11694)
+++ trunk/psLib/src/sys/psString.h	(revision 11711)
@@ -11,6 +11,6 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-08 01:59:28 $
+ * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-08 22:27:30 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,11 +39,23 @@
 #define PS_FILE_LINE p_psFileLine(__FILE__,__LINE__)
 
+
 /** Allocates a new psString.
  *
  *  @return psString:       Newly allocated string of length n.
  */
+#ifdef DOXYGEN
 psString psStringAlloc(
     long nChar                         ///< Size of psString to allocate.
 );
+#else // ifdef DOXYGEN
+psString p_psStringAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    long nChar                         ///< Size of psString to allocate.
+);
+#define psStringAlloc(nChar) \
+      p_psStringAlloc(__FILE__, __LINE__, __func__, nChar)
+#endif // ifdef DOXYGEN
 
 
@@ -68,7 +80,18 @@
  *  @return psString:      Copy of input string
  */
+#ifdef DOXYGEN
 psString psStringCopy(
-    const char *string                 ///< Input string of characters to copy
-);
+    const char *string                  ///< Input string of characters to copy
+);
+#else // ifdef DOXYGEN
+psString p_psStringCopy(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    const char *string                  ///< Input string of characters to copy
+);
+#define psStringCopy(string) \
+      p_psStringCopy(__FILE__, __LINE__, __func__, string)
+#endif // ifdef DOXYGEN
 
 
@@ -85,8 +108,20 @@
  *  @return  psString:   Copy of input string
  */
+#ifdef DOXYGEN
 psString psStringNCopy(
     const char *string,                ///< Input string of characters to copy
     unsigned int nChar                 ///< Number of bytes to allocate for string copy
 );
+#else // ifdef DOXYGEN
+psString p_psStringNCopy(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    const char *string,                 ///< Input string of characters to copy
+    unsigned int nChar                  ///< Number of bytes to allocate for string copy
+);
+#define psStringNCopy(string, nChar) \
+      p_psStringNCopy(__FILE__, __LINE__, __func__, string, nChar)
+#endif // ifdef DOXYGEN
 
 
@@ -98,13 +133,26 @@
  * @return ssize_t:     The length of the new string (excluding '\0')
  */
+#ifdef DOXYGEN
 ssize_t psStringAppend(
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    ...                                 ///< format arguments
+);
+#else // ifdef DOXYGEN
+ssize_t p_psStringAppend(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
     char **dest,                        ///< existing string
     const char *format,                 ///< format to append
     ...                                 ///< format arguments
 #ifdef __GNUC__
-) __attribute__((format(printf, 2, 3)));
-#else // __GNUC__
-);
-#endif // __GNUC__
+) __attribute__((format(printf, 5, 6)));
+#else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
+#define psStringAppend(dest, ...) \
+      p_psStringAppend(__FILE__, __LINE__, __func__, dest, __VA_ARGS__)
+#endif // ifdef DOXYGEN
 
 
@@ -116,4 +164,5 @@
  * @return ssize_t:     The length of the new string (excluding '\0')
  */
+#ifdef DOXYGEN
 ssize_t psStringAppendV(
     char **dest,                        ///< existing string
@@ -121,4 +170,16 @@
     va_list ap                          ///< va_list of format arguments
 );
+#else // ifdef DOXYGEN
+ssize_t p_psStringAppendV(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    va_list ap                          ///< va_list of format arguments
+);
+#define psStringAppendV(dest, format, ap) \
+      p_psStringAppendV(__FILE__, __LINE__, __func__, dest, format, ap)
+#endif // ifdef DOXYGEN
 
 
@@ -130,13 +191,26 @@
  * @return ssize_t:     The length of the new string (excluding '\0')
  */
+#ifdef DOXYGEN
 ssize_t psStringPrepend(
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    ...                                 ///< format arguments
+);
+#else // ifdef DOXYGEN
+ssize_t p_psStringPrepend(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
     char **dest,                        ///< existing string
     const char *format,                 ///< format to append
     ...                                 ///< format arguments
 #ifdef __GNUC__
-) __attribute__((format(printf, 2, 3)));
-# else // __GNUC__
-);
-#endif // __GNUC__
+) __attribute__((format(printf, 5, 6)));
+# else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
+#define psStringPrepend(dest, ...) \
+      p_psStringPrepend(__FILE__, __LINE__, __func__, dest, __VA_ARGS__)
+#endif // ifdef DOXYGEN
 
 
@@ -148,4 +222,5 @@
  * @return ssize_t:     The length of the new string (excluding '\0')
  */
+#ifdef DOXYGEN
 ssize_t psStringPrependV(
     char **dest,                        ///< existing string
@@ -153,4 +228,16 @@
     va_list ap                          ///< va_list of format arguments
 );
+#else // ifdef DOXYGEN
+ssize_t p_psStringPrependV(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    va_list ap                          ///< va_list of format arguments
+);
+#define psStringPrependV(dest, format, ap) \
+      p_psStringPrependV(__FILE__, __LINE__, __func__, dest, format, ap)
+#endif // ifdef DOXYGEN