summaryrefslogtreecommitdiff
path: root/src/helpers.cpp
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2023-10-04 16:52:40 -0400
committerJonathan Bradley <jcb@pikum.xyz>2023-10-04 16:52:40 -0400
commite12ba8979c54e45296ae748e5fb3e586ad4f0bdc (patch)
tree3aa292381b78253cfa99bd3213eae94c5d6eb212 /src/helpers.cpp
parent81e30ca719be3db253a93bf8328b39226ebb58e5 (diff)
saving and loading file with instances works as expected
Diffstat (limited to 'src/helpers.cpp')
-rw-r--r--src/helpers.cpp7
1 files changed, 3 insertions, 4 deletions
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;