diff options
| -rw-r--r-- | dive.h | 2 | ||||
| -rw-r--r-- | parse-xml.c | 11 | ||||
| -rw-r--r-- | qt-ui/models.cpp | 4 | ||||
| -rw-r--r-- | strtod.c | 5 |
4 files changed, 11 insertions, 11 deletions
@@ -806,7 +806,7 @@ extern void remove_weightsystem(struct dive *dive, int idx); #define STRTOD_NO_DOT 0x02 #define STRTOD_NO_COMMA 0x04 #define STRTOD_NO_EXPONENT 0x08 -extern double strtod_flags(char *str, char **ptr, unsigned int flags); +extern double strtod_flags(const char *str, const char **ptr, unsigned int flags); #define STRTOD_ASCII (STRTOD_NO_COMMA) diff --git a/parse-xml.c b/parse-xml.c index 59e04efb1..8fc504a3f 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -263,7 +263,7 @@ enum number_type { FLOAT }; -static enum number_type parse_float(char *buffer, double *res, char **endp) +static enum number_type parse_float(const char *buffer, double *res, const char **endp) { double val; static bool first_time = TRUE; @@ -281,9 +281,8 @@ static enum number_type parse_float(char *buffer, double *res, char **endp) fprintf(stderr, "Floating point value with decimal comma (%s)?\n", buffer); first_time = FALSE; } - /* Try again */ - **endp = '.'; - val = ascii_strtod(buffer, endp); + /* Try again in permissive mode*/ + val = strtod_flags(buffer, endp, 0); } } @@ -297,7 +296,7 @@ union int_or_float { static enum number_type integer_or_float(char *buffer, union int_or_float *res) { - char *end; + const char *end; return parse_float(buffer, &res->fp, &end); } @@ -459,7 +458,7 @@ static void percent(char *buffer, void *_fraction) { fraction_t *fraction = _fraction; double val; - char *end; + const char *end; switch (parse_float(buffer, &val, &end)) { case FLOAT: diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 7f5764779..b0a0dadb2 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -464,9 +464,9 @@ void WeightModel::passInData(const QModelIndex& index, const QVariant& value) } } -weight_t string_to_weight(char *str) +weight_t string_to_weight(const char *str) { - char *end; + const char *end; double value = strtod_flags(str, &end, 0); QString rest = QString(end).trimmed(); QString local_kg = WeightModel::tr("kg"); @@ -29,9 +29,10 @@ #include <ctype.h> #include "dive.h" -double strtod_flags(char *str, char **ptr, unsigned int flags) +double strtod_flags(const char *str, const char **ptr, unsigned int flags) { - char *p = str, c, *ep; + char c; + const char *p = str, *ep; double val = 0.0; double decimal = 1.0; int sign = 0, esign = 0; |