diff options
| -rw-r--r-- | gtk-gui.c | 2 | ||||
| -rw-r--r-- | parse-xml.c | 2 | ||||
| -rw-r--r-- | profile.c | 10 | ||||
| -rw-r--r-- | windows.c | 6 |
4 files changed, 9 insertions, 11 deletions
@@ -1173,7 +1173,7 @@ static void cell_edited_cb(GtkCellRendererText *cell, gchar *path, holdnicknames->nickname = strdup(new_text); holdnicknames->next = NULL; } else { - struct device_info * top = NULL; + struct device_info * top; struct device_info * last = holdnicknames; top = (struct device_info *) malloc(sizeof( struct device_info )); top->model = strdup(model); diff --git a/parse-xml.c b/parse-xml.c index 8128f25ee..5061227e3 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -169,7 +169,7 @@ static void divedate(char *buffer, void *_when) { int d,m,y; timestamp_t *when = _when; - int success = 0; + int success; success = cur_tm.tm_sec | cur_tm.tm_min | cur_tm.tm_hour; if (sscanf(buffer, "%d.%d.%d", &d, &m, &y) == 3) { @@ -391,14 +391,14 @@ static void plot_one_event(struct graphics_context *gc, struct plot_info *pi, st unsigned int he = event->value >> 16; unsigned int o2 = event->value & 0xffff; if (he) { - snprintf(buffer, sizeof(buffer), "%s: (%d/%d)", + snprintf(buffer, sizeof(buffer), "%s: (%u/%u)", _(event->name), o2, he); } else { if (o2 == 21) snprintf(buffer, sizeof(buffer), "%s: %s", _(event->name), _("air")); else - snprintf(buffer, sizeof(buffer), "%s: %d%% %s", + snprintf(buffer, sizeof(buffer), "%s: %u%% %s", _(event->name), o2, _("O" UTF8_SUBSCRIPT_2)); } } else { @@ -1516,10 +1516,10 @@ static void check_gas_change_events(struct dive *dive, struct divecomputer *dc, static void calculate_max_limits(struct dive *dive, struct divecomputer *dc, struct graphics_context *gc) { struct plot_info *pi; - int maxdepth = 0; + int maxdepth; int maxtime = 0; int maxpressure = 0, minpressure = INT_MAX; - int mintemp = 0, maxtemp = 0; + int mintemp, maxtemp; int cyl; /* The plot-info is embedded in the graphics context */ @@ -1751,8 +1751,6 @@ static void populate_pressure_information(struct dive *dive, struct divecomputer for (i = 1; i < pi->nr; i++) { struct plot_data *entry = pi->entry + i; - entry = pi->entry + i; - /* discrete integration of pressure over time to get the SAC rate equivalent */ current->pressure_time += pressure_time(dive, entry-1, entry); @@ -53,7 +53,7 @@ void subsurface_set_conf(char *name, const char *value) * to pass the boolean value), the other one passes value (the * address of the string. */ int wlen; - wchar_t *wname = NULL, *wstring = NULL; + wchar_t *wname, *wstring; wname = (wchar_t *)g_utf8_to_utf16(name, -1, NULL, NULL, NULL); if (!wname) @@ -73,7 +73,7 @@ void subsurface_set_conf(char *name, const char *value) void subsurface_set_conf_bool(char *name, int value) { - wchar_t *wname = NULL; + wchar_t *wname; wname = (wchar_t *)g_utf8_to_utf16(name, -1, NULL, NULL, NULL); if (!wname) @@ -89,7 +89,7 @@ const void *subsurface_get_conf(char *name) const int csize = 64; int blen = 0; LONG ret = ERROR_MORE_DATA; - wchar_t *wstring = NULL, *wname = NULL; + wchar_t *wstring = NULL, *wname; char *utf8_string; wname = (wchar_t *)g_utf8_to_utf16(name, -1, NULL, NULL, NULL); |