From e12ba8979c54e45296ae748e5fb3e586ad4f0bdc Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Wed, 4 Oct 2023 16:52:40 -0400 Subject: saving and loading file with instances works as expected --- src/helpers.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/helpers.cpp') diff --git a/src/helpers.cpp b/src/helpers.cpp index 7ae21c9..22be4de 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -124,7 +124,7 @@ STR2NUM_ERROR str2num(float &f, char const *s, char *&pEnd) { if (errno == ERANGE && l == -HUGE_VALF) { return UNDERFLOW; } - if (*s == '\0' || *pEnd != '\0') { + if (*s == '\0' || s == pEnd) { return INCONVERTIBLE; } f = l; @@ -137,17 +137,16 @@ STR2NUM_ERROR str2num(float &f, char const *s) { } STR2NUM_ERROR str2num(double &d, char const *s, char *&pEnd) { - char *end; float l; errno = 0; - l = strtod(s, &end); + l = strtod(s, &pEnd); if (errno == ERANGE && l == HUGE_VAL) { return OVERFLOW; } if (errno == ERANGE && l == -HUGE_VAL) { return UNDERFLOW; } - if (*s == '\0' || *end != '\0') { + if (*s == '\0' || s == pEnd) { return INCONVERTIBLE; } d = l; -- cgit v1.2.3