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

gio: Eliminate warnings in cstring conversion on OS X

Browse Source 
create_cstr_from_cfstring_with_fallback() is allowed to be called when str == NULL
but create_cstr_from_cfstring() isn't which leads to warnings in the console.
Fix this by adding NULL checks into create_cstr_from_cfstring_with_fallback().

https://bugzilla.gnome.org/show_bug.cgi?id=788936
This commit is contained in:
Jiří Techet 2017-10-22 12:12:59 +02:00 committed by Philip Withnall
parent 6acaca8831
commit 9bcd7800a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gosxcontenttype.c
View File

@ -90,8 +90,9 @@ static gchar *
create_cstr_from_cfstring_with_fallback (CFStringRef str, create_cstr_from_cfstring_with_fallback (CFStringRef str,
const gchar *fallback) const gchar *fallback)
{ {
gchar *cstr; gchar *cstr = NULL;
if (str)
cstr = create_cstr_from_cfstring (str); cstr = create_cstr_from_cfstring (str);
if (!cstr) if (!cstr)
return g_strdup (fallback); return g_strdup (fallback);