In fetch_env_ulong(), report a parse that consumes fewer than all

characters differently than other parse failures.

1 files changed, 5 insertions, 1 deletions

diff --git a/test/vfd_swmr_common.c b/test/vfd_swmr_common.c
index c79610d..bf1cc59 100644
--- a/test/vfd_swmr_common.c
+++ b/test/vfd_swmr_common.c
@@ -209,10 +209,14 @@ fetch_env_ulong(const char *varname, unsigned long limit, unsigned long *valp)
 
     errno = 0;
     ul = strtoul(tmp, &end, 0);
-    if ((ul == ULONG_MAX && errno != 0) || end == tmp || *end != '\0') {
+    if (ul == ULONG_MAX && errno != 0) {
         fprintf(stderr, "could not parse %s: %s\n", varname, strerror(errno));
         return -1;
     }
+    if (end == tmp || *end != '\0') {
+        fprintf(stderr, "could not parse %s\n", varname);
+        return -1;
+    }
     if (ul > limit) {
         fprintf(stderr, "%s (%lu) out of range\n", varname, ul);
         return -1;