Changeset 4434

Timestamp:

Jun 29, 2005, 2:33:36 PM (21 years ago)

Author:

evanalst

Message:

Update psStringNCopy to check for maximum value.

Location:

trunk/psLib/src

Files:

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

trunk/psLib/src/sys/psString.c

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-30 00:33:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include "psString.h"
 #include "psMemory.h"
@@ -34 +35 @@
 }
 
-psString psStringNCopy(const char *string, int nChar)
+psString psStringNCopy(const char *string, unsigned int nChar)
 {
     char *returnValue = NULL;
 
     // Check the number of characters to copy is non-negative
-    if (nChar < 0) {
+    if (nChar == UINT_MAX) {
         // Log error message and return NULL
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,

trunk/psLib/src/sys/psString.h

@@ -13 +13 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-30 00:33:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
 psString psStringNCopy(
     const char *string,                ///< Input string of characters to copy
-    int nChar                          ///< Number of bytes to allocate for string copy
+    unsigned int nChar                          ///< Number of bytes to allocate for string copy
 );
 

trunk/psLib/src/sysUtils/psString.c

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-30 00:33:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include "psString.h"
 #include "psMemory.h"
@@ -34 +35 @@
 }
 
-psString psStringNCopy(const char *string, int nChar)
+psString psStringNCopy(const char *string, unsigned int nChar)
 {
     char *returnValue = NULL;
 
     // Check the number of characters to copy is non-negative
-    if (nChar < 0) {
+    if (nChar == UINT_MAX) {
         // Log error message and return NULL
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,

trunk/psLib/src/sysUtils/psString.h

@@ -13 +13 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-30 00:33:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
 psString psStringNCopy(
     const char *string,                ///< Input string of characters to copy
-    int nChar                          ///< Number of bytes to allocate for string copy
+    unsigned int nChar                          ///< Number of bytes to allocate for string copy
 );