luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdatetime: Fix a spurious gcc warning

Browse Source 
It’s possible to get a -Wmaybe-uninitialized warning out of this code
with some GCC versions. Rework the code to avoid needing the conditional
free.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=728108
This commit is contained in:
Philip Withnall 2018-04-12 13:19:21 +01:00
parent 68f6d39895
commit a80117c371
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/gdatetime.c
View File

@ -3197,6 +3197,7 @@ g_date_time_format_locale (GDateTime *datetime,
break; break;
case 'Z': case 'Z':
tz = g_date_time_get_timezone_abbreviation (datetime); tz = g_date_time_get_timezone_abbreviation (datetime);
tmp = NULL;
tmp_len = strlen (tz); tmp_len = strlen (tz);
if (!locale_is_utf8) if (!locale_is_utf8)
{ {
@ -3205,7 +3206,6 @@ g_date_time_format_locale (GDateTime *datetime,
return FALSE; return FALSE;
} }
g_string_append_len (outstr, tz, tmp_len); g_string_append_len (outstr, tz, tmp_len);
if (!locale_is_utf8)
g_free (tmp); g_free (tmp);
break; break;
case '%': case '%':