Index: trunk/psLib/src/sys/psString.h
===================================================================
--- trunk/psLib/src/sys/psString.h	(revision 11616)
+++ trunk/psLib/src/sys/psString.h	(revision 11694)
@@ -9,7 +9,8 @@
  * @author Eric Van Alst, MHPCC
  * @author David Robbins, MHPCC
- *
- * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-02-03 05:35:30 $
+ * @author Joshua Hoblitt, University of Hawaii
+ *
+ * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-08 01:59:28 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,5 +32,9 @@
 
 /** This macro returns a (static buffer containing) "file:line" */
+#ifdef __GNUC__
+const char *p_psFileLine(const char *file, int line) __attribute__((deprecated));
+#else // ifdef __GNUC__
 const char *p_psFileLine(const char *file, int line);
+#endif // ifdef __GNUC__
 #define PS_FILE_LINE p_psFileLine(__FILE__,__LINE__)
 
@@ -42,7 +47,9 @@
 );
 
+
 /** Checks the type of a particular pointer.
  *
- *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr
+ *  datatype.
  *
  *  @return bool:       True if the pointer matches a psString structure, false otherwise.
@@ -51,4 +58,5 @@
     psPtr ptr                          ///< the pointer whose type to check
 );
+
 
 /** Copies the input string
@@ -63,4 +71,5 @@
     const char *string                 ///< Input string of characters to copy
 );
+
 
 /** Copies the input string up to the specified number of characters
@@ -81,4 +90,5 @@
 );
 
+
 /** Appends a format onto a string
  *
@@ -88,53 +98,47 @@
  * @return ssize_t:     The length of the new string (excluding '\0')
  */
+ssize_t psStringAppend(
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    ...                                 ///< format arguments
 #ifdef __GNUC__
-ssize_t psStringAppend(
-    char **dest,                        ///< existing string
-    const char *format,                 ///< format to append
-    ...                                 ///< format arguments
 ) __attribute__((format(printf, 2, 3)));
 #else // __GNUC__
-ssize_t psStringAppend(
+);
+#endif // __GNUC__
+
+
+/** Appends 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 psStringAppendV(
+    char **dest,                        ///< existing string
+    const char *format,                 ///< format to append
+    va_list ap                          ///< va_list of format arguments
+);
+
+
+/** 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 psStringPrepend(
     char **dest,                        ///< existing string
     const char *format,                 ///< format to append
     ...                                 ///< format arguments
-);
-#endif // __GNUC__
-
-/** Appends 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 psStringAppendV(
-    char **dest,                        ///< existing string
-    const char *format,                 ///< format to append
-    va_list ap                          ///< va_list of format arguments
-);
-
-/** 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')
- */
 #ifdef __GNUC__
-ssize_t psStringPrepend(
-    char **dest,                        ///< existing string
-    const char *format,                 ///< format to append
-    ...                                 ///< format arguments
 ) __attribute__((format(printf, 2, 3)));
 # else // __GNUC__
-
-    ssize_t psStringPrepend(
-        char **dest,                        ///< existing string
-        const char *format,                 ///< format to append
-        ...                                 ///< format arguments
-    );
+);
 #endif // __GNUC__
 
+
 /** Prepends a format onto a string
  *
@@ -149,4 +153,5 @@
     va_list ap                          ///< va_list of format arguments
 );
+
 
 /** Procedure to split the input string into a psList of psStrings.
@@ -163,4 +168,5 @@
 );
 
+
 /** Procedure to split the input string into a psArray of psStrings.
  *
@@ -176,10 +182,11 @@
 );
 
-// Given the input string, search for all copies of the key, and replace with the replacement value
-// the input string may be freed if not needed
+// Given the input string, search for all copies of the key, and replace with
+// the replacement value the input string may be freed if not needed
 /** Procedure to search an input string and substitute strings where desired.
  *
- *  The input string is searched for all instances of the key, which is then replaced with
- *  the replacement value wherever found.  The input string may be freed if not needed.
+ *  The input string is searched for all instances of the key, which is then
+ *  replaced with the replacement value wherever found.  The input string may
+ *  be freed if not needed.
  *
  *  @return ssize_t:      the length of the new string (excluding '\0')
@@ -191,4 +198,5 @@
 );
 
+
 // strip whitespace from head and tail of string
 /** Procedure to strip the whitespace from the head and tail of a string.
@@ -199,4 +207,5 @@
     char *string                       ///< input string to be stripped.
 );
+
 
 /// Given a CVS keyword string, strip off the CVS-specific keyword to get the value
@@ -222,4 +231,5 @@
 #endif // ifndef DOXYGEN
 
+
 /// @}
 #endif // #ifndef PS_STRING_H