common/strtol.cc: Get error testing also to work on FreeBSD

 - change order of testing
 - But report the same error types.
 - Changed to report for the last error since the value is there but
   not allowed characters follow.

Error found by: run-cli-tests, because the wrong string was returned.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

diff --git a/src/common/strtol.cc b/src/common/strtol.cc
index 321521d1f2df47e6367ec522314404f0ee13724c..863ef08cf46d9e291821850cbf836bbbe28ed773 100644 (file)
--- a/src/common/strtol.cc
+++ b/src/common/strtol.cc
@@ -28,6 +28,13 @@ long long strict_strtoll(const char *str, int base, std::string *err)
   errno = 0; /* To distinguish success/failure after call (see man page) */
   long long ret = strtoll(str, &endptr, base);
 
+  if (endptr == str) {
+    errStr = "Expected option value to be integer, got '";
+    errStr.append(str);
+    errStr.append("'");
+    *err =  errStr;
+    return 0;
+  }
   if ((errno == ERANGE && (ret == LLONG_MAX || ret == LLONG_MIN))
       || (errno != 0 && ret == 0)) {
     errStr = "The option value '";
@@ -37,18 +44,11 @@ long long strict_strtoll(const char *str, int base, std::string *err)
     *err = errStr;
     return 0;
   }
-  if (endptr == str) {
-    errStr = "Expected option value to be integer, got '";
-    errStr.append(str);
-    errStr.append("'");
-    *err =  errStr;
-    return 0;
-  }
   if (*endptr != '\0') {
     errStr = "The option value '";
     errStr.append(str);
     errStr.append("'");
-    errStr.append(" seems to be invalid");
+    errStr.append(" contains invalid digits");
     *err =  errStr;
     return 0;
   }