Changes in libcfa/src/parseargs.cfa [7f6e9eb:56e8cb3]

File:

• libcfa/src/parseargs.cfa (modified) (4 diffs)

libcfa/src/parseargs.cfa

@@ -19 +19 @@
         extern          long long int strtoll (const char* str, char** endptr, int base);
         extern unsigned long long int strtoull(const char* str, char** endptr, int base);
-        extern                 double strtod  (const char* str, char** endptr);
 }
 
@@ -163 +162 @@
 }
 
-bool parse(const char * arg, int & value) {
-        char * end;
-        int r = strtoll(arg, &end, 10);
-        if(*end != '\0') return false;
-
-        value = r;
-        return true;
-}
-
 bool parse(const char * arg, unsigned & value) {
         char * end;
@@ -182 +172 @@
 }
 
-bool parse(const char * arg, size_t & value) {
+bool parse(const char * arg, unsigned long & value) {
         char * end;
         unsigned long long int r = strtoull(arg, &end, 10);
         if(*end != '\0') return false;
-        if(r > (size_t)MAX) return false;
+        if(r > (unsigned long)MAX) return false;
 
         value = r;
@@ -192 +182 @@
 }
 
-bool parse(const char * arg, double & value) {
+bool parse(const char * arg, unsigned long long & value) {
+        char * end;
+        unsigned long long int r = strtoull(arg, &end, 10);
+        if(*end != '\0') return false;
+        if(r > (unsigned long long)MAX) return false;
+
+        value = r;
+        return true;
+}
+
+bool parse(const char * arg, int & value) {
         char * end;
-        double r = strtod(arg, &end);
+        int r = strtoll(arg, &end, 10);
         if(*end != '\0') return false;