Changeset 13521

Timestamp:

May 24, 2007, 6:15:46 PM (19 years ago)

Author:

Paul Price

Message:

Change to allow integers to be specified as hexadecimal. This also
allows error checking (strtol instead of atoi).

File:

• trunk/psLib/src/types/psArguments.c (modified) (3 diffs)

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-05-11 23:37:37 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-05-25 04:15:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -132 +132 @@
 
 
-#define ARG_READ_CASE(TYPE,FUNC) \
-case PS_TYPE_##TYPE: \
-item->data.TYPE = FUNC(argv[argnum]); \
-return psArgumentRemove(argnum, argc, argv);
+#define ARG_READ_CASE_INT(TYPE,FUNC) \
+case PS_TYPE_##TYPE: { \
+    char *end; \
+    item->data.TYPE = FUNC(argv[argnum], &end, 0); \
+    if (end == argv[argnum]) { \
+        psError(PS_ERR_IO, true, "Unable to read argument value for %s", item->name); \
+        return false; \
+    } \
+    return psArgumentRemove(argnum, argc, argv); \
+}
+
+#define ARG_READ_CASE_FLOAT(TYPE,FUNC) \
+case PS_TYPE_##TYPE: { \
+    char *end; \
+    item->data.TYPE = FUNC(argv[argnum], &end); \
+    if (end == argv[argnum]) { \
+        psError(PS_ERR_IO, true, "Unable to read argument value for %s", item->name); \
+        return false; \
+    } \
+    return psArgumentRemove(argnum, argc, argv); \
+}
 
 static bool argumentRead(psMetadataItem *item, // Item to read into
@@ -145 +162 @@
     switch(item->type)
     {
-        ARG_READ_CASE(U8,atoi);
-        ARG_READ_CASE(U16,atoi);
-        ARG_READ_CASE(U32,atoi);
-        ARG_READ_CASE(U64,atoi);
-        ARG_READ_CASE(S8,atoi);
-        ARG_READ_CASE(S16,atoi);
-        ARG_READ_CASE(S32,atoi);
-        ARG_READ_CASE(S64,atoi);
-        ARG_READ_CASE(F32,atof);
-        ARG_READ_CASE(F64,atof);
+        ARG_READ_CASE_INT(U8,strtol);
+        ARG_READ_CASE_INT(U16,strtol);
+        ARG_READ_CASE_INT(U32,strtol);
+        ARG_READ_CASE_INT(U64,strtoll);
+        ARG_READ_CASE_INT(S8,strtol);
+        ARG_READ_CASE_INT(S16,strtol);
+        ARG_READ_CASE_INT(S32,strtol);
+        ARG_READ_CASE_INT(S64,strtoll);
+        ARG_READ_CASE_FLOAT(F32,strtof);
+        ARG_READ_CASE_FLOAT(F64,strtod);
     case PS_DATA_BOOL:
         // Turn option on; no optional argument to remove