Changeset 7380 for trunk/psLib/src/sys

Timestamp:

Jun 6, 2006, 5:22:07 PM (20 years ago)

Author:

Paul Price

Message:

Merging the pslib "additional" functions from the modules into psLib proper.

Added jpeg directory for psImageJpeg.
Changes to build system (configure.ac, and various Makefile.am)

psVectorSmooth: changed API to allow optional output vector
psSparse: changed sizes to type "long"; added "const"
psRegionIsBad: Renamed psRegionIsNaN
psImageBicubeFit: changed sizes to "long"; added a "const"
psLine: changed sizes to "long"
psImageUnbin: description required in SDRS
psImageClippedStats: renaming to psImageBackground; removing static structures; API changed!
psImageFlipX, psImageFlipY merged to psImageFlip
psStringSubstitute: added "const"

Location:

trunk/psLib/src/sys

Files:

• Makefile.am (modified) (2 diffs)
• psLine.c (added)
• psLine.h (added)
• psString.c (modified) (5 diffs)
• psString.h (modified) (2 diffs)

trunk/psLib/src/sys/Makefile.am

@@ -9 +9 @@
         psError.c      \
         psErrorCodes.c \
+        psLine.c       \
         psLogMsg.c     \
         psMemory.c     \
@@ -32 +33 @@
         psError.h      \
         psErrorCodes.h \
+        psLine.h       \
         psLogMsg.h     \
         psMemory.h     \

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-31 20:56:37 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-07 03:22:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 psString psStringCopy(const char *string)
 {
-    PS_ASSERT_PTR_NON_NULL(string, NULL);
+    // Pass through NULL values!
+
     // Allocate memory using psAlloc function
     // Copy input string to memory just allocated
     // Return the copy
-    // Pass through NULL values
     return string ? strcpy(psAlloc(strlen(string) + 1), string) : NULL;
 }
@@ -218 +218 @@
 // 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
-char *psStringSubstitute (char *input, char *replace, char *key)
-{
-
-    char *p;
-
-    if (key == NULL)
+char *psStringSubstitute(char *input, const char *replace, const char *key)
+{
+    if (key == NULL || strlen(key) == 0) {
         return input;
-    if (strlen(key) == 0)
-        return input;
+    }
 
     while (true) {
-        p = strstr (input, key);
-        if (p == NULL)
+        char *p = strstr (input, key);
+        if (!p) {
             return input;
+        }
 
         // we have input = xxxkeyxxx
@@ -241 +238 @@
 
         // copy the first segement into 'output'
-        strncpy (output, input, Nc);
+        strncpy(output, input, Nc);
 
         // copy the key replacement to the start of the key
-
-        strcpy (&output[Nc], replace);
+        strcpy(&output[Nc], replace);
         Nc += strlen (replace);
 
         // copy the remainder to the end of the replacement
-        strcpy (&output[Nc], p + strlen(key));
-
-        psFree (input);
+        strcpy(&output[Nc], p + strlen(key));
+
+        psFree(input);
         input = output;
     }
@@ -257 +253 @@
 }
 
+psArray *psStringSplitArray(const char *string, const char *splitters, bool multi)
+{
+
+    psList *list = psStringSplit(string, splitters, multi);
+    psArray *array = psListToArray(list);
+    psFree (list);
+    return array;
+}
+
+#ifndef whitespace
+#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
+#endif
+
+/* Strip whitespace from the start and end of STRING. */
+size_t psStringStrip(char *string)
+{
+    long i;
+
+    if (!string || strlen(string) == 0) {
+        return 0;
+    }
+
+    for (i = 0; i < strlen(string) && whitespace(string[i]); i++)
+        ; // No action
+    if (i) {
+        memmove (string, string + i, strlen(string+i)+1);
+    }
+    for (i = strlen (string) - 1; (i > 0) && whitespace(string[i]); i--)
+        ; // No action
+    string[++i] = 0;
+
+    return i;
+}

trunk/psLib/src/sys/psString.h

@@ -14 +14 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 21:33:34 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-07 03:22:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -107 +107 @@
 );
 
-// given the input string, search for all copies of the key, and replace with the replacement value
+// Same as psStringSplit, but return result as an array
+psArray *psStringSplitArray(const char *string, // String to split
+                            const char *splitters, // Characters on which to split
+                            bool multipleAreSignificant // Are multiple occurences significant?
+                           );
+
+// 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
-char *psStringSubstitute (
-    char *input,    ///< input string to be modified
-    char *replace,    ///< replacement value
-    char *key    ///< string to be replaced in input
-);
+char *psStringSubstitute (char *input,  ///< input string to be modified
+                          const char *replace, ///< replacement value
+                          const char *key ///< string to be replaced in input
+                         );
+
+// strip whitespace from head and tail of string
+size_t psStringStrip(char *string);
+
 
 /** @} */// Doxygen - End of SystemGroup Functions