luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-29 08:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_more_warnings' into 'main'

Browse Source 
Fix more warnings

See merge request GNOME/glib!2119
This commit is contained in:
Philip Withnall 2021-06-10 09:37:34 +00:00
commit 71edc3ffe1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/gunicollate.c
View File

@ -441,7 +441,7 @@ g_utf8_collate_key (const gchar *str,
if (str_locale) if (str_locale)
{ {
xfrm_len = strxfrm (NULL, str_locale, 0); xfrm_len = strxfrm (NULL, str_locale, 0);
if (xfrm_len < 0 || xfrm_len >= G_MAXINT - 2) if (xfrm_len >= G_MAXINT - 2)
{ {
g_free (str_locale); g_free (str_locale);
str_locale = NULL; str_locale = NULL;

2
glib/tests/once.c
View File

@ -192,7 +192,7 @@ test_once_init_multi_threaded (void)
static void static void
test_once_init_string (void) test_once_init_string (void)
{ {
static const gchar *val; static gchar *val;
g_test_summary ("Test g_once_init_{enter,leave}() usage with a string"); g_test_summary ("Test g_once_init_{enter,leave}() usage with a string");