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

Make g_strerror() do less work

Browse Source 
Store the (translated, UTF-8-encoded) error strings in a hash table to
avoid doing translation and (possibly) g_locale_to_utf8() in every
g_strerror() call.

https://bugzilla.gnome.org/show_bug.cgi?id=754788
This commit is contained in:
Dan Winship 2015-08-06 15:39:22 -04:00
parent 19eb511ba4
commit 96675446c5
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
glib/gstrfuncs.c
View File

@ -1253,40 +1253,53 @@ g_ascii_strtoll (const gchar *nptr,
const gchar * const gchar *
g_strerror (gint errnum) g_strerror (gint errnum)
{ {
gchar buf[1024]; static GHashTable *errors;
gchar *msg; G_LOCK_DEFINE_STATIC (errors);
gchar *tofree = NULL; const gchar *msg;
const gchar *ret;
gint saved_errno = errno; gint saved_errno = errno;
GError *error = NULL;
G_LOCK (errors);
if (errors)
msg = g_hash_table_lookup (errors, GINT_TO_POINTER (errnum));
else
{
errors = g_hash_table_new (NULL, NULL);
msg = NULL;
}
if (!msg)
{
gchar buf[1024];
GError *error = NULL;
#if defined(G_OS_WIN32) #if defined(G_OS_WIN32)
strerror_s (buf, sizeof (buf), errnum); strerror_s (buf, sizeof (buf), errnum);
msg = buf; msg = buf;
#elif defined(HAVE_STRERROR_R) #elif defined(HAVE_STRERROR_R)
/* Match the condition in strerror_r(3) for glibc */ /* Match the condition in strerror_r(3) for glibc */
# if defined(__GLIBC__) && !((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) # if defined(__GLIBC__) && !((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
msg = strerror_r (errnum, buf, sizeof (buf)); msg = strerror_r (errnum, buf, sizeof (buf));
# else # else
strerror_r (errnum, buf, sizeof (buf)); strerror_r (errnum, buf, sizeof (buf));
msg = buf; msg = buf;
# endif /* HAVE_STRERROR_R */ # endif /* HAVE_STRERROR_R */
#else #else
g_strlcpy (buf, strerror (errnum), sizeof (buf)); g_strlcpy (buf, strerror (errnum), sizeof (buf));
msg = buf; msg = buf;
#endif #endif
if (!g_get_charset (NULL)) if (!g_get_charset (NULL))
{ {
msg = tofree = g_locale_to_utf8 (msg, -1, NULL, NULL, &error); msg = g_locale_to_utf8 (msg, -1, NULL, NULL, &error);
if (error) if (error)
g_print ("%s\n", error->message); g_print ("%s\n", error->message);
} }
ret = g_intern_string (msg); g_hash_table_insert (errors, GINT_TO_POINTER (errnum), (char *) msg);
g_free (tofree); }
G_UNLOCK (errors);
errno = saved_errno; errno = saved_errno;
return ret; return msg;
} }
/** /**