summaryrefslogtreecommitdiffstats
path: root/parse-xml.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-12-20 09:37:56 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-12-20 09:53:06 -0800
commit0421a161b4e3e319fb57397b5a729a3440a82c80 (patch)
treea8994be0a1de08aea2a362baa0c0e1fb7aed69d2 /parse-xml.c
parent4ab58d6b47e8786d0a10c1308ee487e10af7fa83 (diff)
downloadsubsurface-0421a161b4e3e319fb57397b5a729a3440a82c80.tar.gz
Silence a few warnings
None of these are actual bugs. But none of the fixes are harmful, either. And much as I hate adding the 'default' clauses, I'd rather not have the build output cluttered by invalid warnings. The exception is the fix in divelistview.cpp - while I don't think it is possible for this function to be called with no dive selected, initializing pd to NULL is cheap insurance in case that does happen for some weird reason. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
-rw-r--r--parse-xml.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/parse-xml.c b/parse-xml.c
index b9fa5ff01..cb8312008 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -267,7 +267,7 @@ double ascii_strtod(char *str, char **ptr)
{
char *p = str, c, *ep;
double val = 0.0;
- double decimal;
+ double decimal = 1.0;
int sign = 0, esign = 0;
int numbers = 0, dot = 0;
@@ -290,7 +290,6 @@ double ascii_strtod(char *str, char **ptr)
if (dot)
goto done;
dot = 1;
- decimal = 1.0;
continue;
}
if (c >= '0' && c <= '9') {
@@ -399,7 +398,7 @@ static enum number_type integer_or_float(char *buffer, union int_or_float *res)
static void pressure(char *buffer, void *_press)
{
- double mbar;
+ double mbar = 0.0;
pressure_t *pressure = _press;
union int_or_float val;