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

Merge branch '1732-gai_strerror-locale' into 'master'

Browse Source 
gresolver: Convert encoding of gai_strerror() return value

Closes 

See merge request
This commit is contained in:
Sebastian Dröge 2019-03-22 13:57:39 +00:00
commit ecad5cd522
2 changed files with 9 additions and 11 deletions

7
gio/gresolver.c

@ -343,15 +343,14 @@ handle_ip_address (const char *hostname,
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *error_message = g_win32_error_message (WSAHOST_NOT_FOUND); gchar *error_message = g_win32_error_message (WSAHOST_NOT_FOUND);
#else #else
const gchar *error_message = gai_strerror (EAI_NONAME); gchar *error_message = g_locale_to_utf8 (gai_strerror (EAI_NONAME), -1, NULL, NULL, NULL);
if (error_message == NULL)
error_message = g_strdup ("[Invalid UTF-8]");
#endif #endif
g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND, g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
_("Error resolving “%s”: %s"), _("Error resolving “%s”: %s"),
hostname, error_message); hostname, error_message);
#ifdef G_OS_WIN32
g_free (error_message); g_free (error_message);
#endif
return TRUE; return TRUE;
} }

13
gio/gthreadedresolver.c

@ -157,7 +157,9 @@ do_lookup_by_name (GTask *task,
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *error_message = g_win32_error_message (WSAGetLastError ()); gchar *error_message = g_win32_error_message (WSAGetLastError ());
#else #else
const gchar *error_message = gai_strerror (retval); gchar *error_message = g_locale_to_utf8 (gai_strerror (retval), -1, NULL, NULL, NULL);
if (error_message == NULL)
error_message = g_strdup ("[Invalid UTF-8]");
#endif #endif
g_task_return_new_error (task, g_task_return_new_error (task,
@ -165,10 +167,7 @@ do_lookup_by_name (GTask *task,
g_resolver_error_from_addrinfo_error (retval), g_resolver_error_from_addrinfo_error (retval),
_("Error resolving “%s”: %s"), _("Error resolving “%s”: %s"),
hostname, error_message); hostname, error_message);
#ifdef G_OS_WIN32
g_free (error_message); g_free (error_message);
#endif
} }
if (res) if (res)
@ -323,7 +322,9 @@ do_lookup_by_address (GTask *task,
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *error_message = g_win32_error_message (WSAGetLastError ()); gchar *error_message = g_win32_error_message (WSAGetLastError ());
#else #else
const gchar *error_message = gai_strerror (retval); gchar *error_message = g_locale_to_utf8 (gai_strerror (retval), -1, NULL, NULL, NULL);
if (error_message == NULL)
error_message = g_strdup ("[Invalid UTF-8]");
#endif #endif
phys = g_inet_address_to_string (address); phys = g_inet_address_to_string (address);
@ -334,9 +335,7 @@ do_lookup_by_address (GTask *task,
phys ? phys : "(unknown)", phys ? phys : "(unknown)",
error_message); error_message);
g_free (phys); g_free (phys);
#ifdef G_OS_WIN32
g_free (error_message); g_free (error_message);
#endif
} }
} }