Changeset 6132

Timestamp:

Jan 21, 2006, 1:44:37 PM (20 years ago)

Author:

magnier

Message:

adding patch from josh

Location:

branches/eam_rel9_b1/psLib/src

Files:

• sys/psString.c (modified) (3 diffs)
• sys/psString.h (modified) (3 diffs)
• types/psMetadata.c (modified) (2 diffs)

branches/eam_rel9_b1/psLib/src/sys/psString.c

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.21.6.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-17 09:23:21 $
+ *  @version $Revision: 1.21.6.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-21 23:44:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
     // Copy input string to memory just allocated
     // Return the copy
-    return strcpy(psAlloc(strlen(string) + 1), string);
+    // Pass through NULL values
+    return string ? strcpy(psAlloc(strlen(string) + 1), string) : NULL;
 }
 
@@ -50 +51 @@
     // Copy input string to memory allocated up to nChar characters
     // Return the copy
-    returnValue = strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar);
+    // Pass through NULL values
+    returnValue =
+              string ? strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar)
+              : NULL;
 
     // Ensure the last byte is NULL character

branches/eam_rel9_b1/psLib/src/sys/psString.h

@@ -13 +13 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.16.18.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-17 09:23:21 $
+ *  @version $Revision: 1.16.18.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-21 23:44:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
 /** Copies the input string
  *
- *  This function shall allocate memory to the length of the input string
- *  plus one and copy the input string to the newly allocated memory.
+ *  This function shall allocate memory to the length of the input string plus
+ *  one and copy the input string to the newly allocated memory.  If 'string'
+ *  is 'NULL' then 'NULL' is returned.
  *
  *  @return psString:      Copy of input string
@@ -54 +55 @@
  *  string will be a substring of the input string.  If the input string
  *  is smaller than nChar bytes then the remaining bytes allocated will
- *  be set to NULL.
+ *  be set to NULL.  If 'string' is 'NULL' then 'NULL' is returned.
  *
  *  @return  psString:   Copy of input string

branches/eam_rel9_b1/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.92.6.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-17 09:24:23 $
+ *  @version $Revision: 1.92.6.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-21 23:44:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -244 +244 @@
     case PS_DATA_STRING:
         // Perform copy of input strings
-        metadataItem->data.V = psStringNCopy(va_arg(argPtr, char *), MAX_STRING_LENGTH);
+        {
+            char *string = va_arg(argPtr, char *);
+            metadataItem->data.V =
+                string ? psStringNCopy(string, MAX_STRING_LENGTH)
+                : NULL;
+        }
         break;
     case     PS_DATA_ARRAY:                     // psArray