From a70a8898722e1e70ba0ff408414b20fdfce52548 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 7 Apr 2013 19:50:26 -0700
Subject: [PATCH] Fix some of the gcc-4.8 warnings
Most of the warnings are IMHO false positives:
e.g.: an enum variable is initialized in a switch statement that has a case for
each possible enum value - yet gcc 4.8 warns that it could be used
uninitialized;
or: two variables are initialized together in the code - second one of them
is previously initialized to -1 at declaration time, both are initialized
in an if (second one == -1) clause - so they are guaranteed to both be
initialized...
I did not "fix" those as the code is actually correct.
But there are three spots where it catches things that could indeed go wrong
(with odd input data in one of them).
This commit also adds a check to only call g_type_init() for older versions of
glib as in newer ones it is deprecated.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
gtk-gui.c | 3 ++-
statistics.c | 1 +
uemis-downloader.c | 2 +-
uemis.c | 5 +++--
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gtk-gui.c b/gtk-gui.c
index becf0fdac..c7714e5fe 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -1734,8 +1734,9 @@ void init_ui(int *argcp, char ***argvp)
star_strings[4] = "**** ";
star_strings[5] = "*****";
}
+#if !GLIB_CHECK_VERSION(2,3,6)
g_type_init();
-
+#endif
subsurface_open_conf();
load_preferences();
diff --git a/statistics.c b/statistics.c
index a39799a08..502c06cb4 100644
--- a/statistics.c
+++ b/statistics.c
@@ -668,6 +668,7 @@ static void get_ranges(char *buffer, int size)
}
}
}
+ len = strlen(buffer);
if (first != last) {
if (first + 1 == last)
snprintf(buffer + len, size - len, ", %d", last);
diff --git a/uemis-downloader.c b/uemis-downloader.c
index c5113d95a..d33f08b8c 100644
--- a/uemis-downloader.c
+++ b/uemis-downloader.c
@@ -546,7 +546,7 @@ static void parse_divespot(char *buf)
char *tag, *type, *val;
char locationstring[1024] = "";
int divespot, len;
- double latitude, longitude;
+ double latitude = 0.0, longitude = 0.0;
if (strcmp(tp, "divespot"))
diff --git a/uemis.c b/uemis.c
index aad76c10f..3f7c71b7f 100644
--- a/uemis.c
+++ b/uemis.c
@@ -288,7 +288,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
int datalen;
int i;
uint8_t *data;
- struct sample *sample;
+ struct sample *sample = NULL;
uemis_sample_t *u_sample;
struct dive *dive = datap;
struct divecomputer *dc = &dive->dc;
@@ -365,6 +365,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap) {
i += 0x25;
u_sample++;
}
- dive->dc.duration.seconds = sample->time.seconds - 1;
+ if (sample)
+ dive->dc.duration.seconds = sample->time.seconds - 1;
return;
}