diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2021-06-10 09:37:34 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-06-10 09:37:34 +0000 |
| commit | 71edc3ffe11b27a708500389dbfa3ba3f5aee0ba (patch) | |
| tree | 3d5b2d44c1b1c71e57f4fc40b382c6db2cd8181c | |
| parent | c816ee5bd1c666436fc6f1be19721eb3f9b27de4 (diff) | |
| parent | f4d6680f133b77dfaf43567253a3348ac8e548bf (diff) | |
| download | glib-71edc3ffe11b27a708500389dbfa3ba3f5aee0ba.tar.gz | |
Merge branch 'fix_more_warnings' into 'main'
Fix more warnings
See merge request GNOME/glib!2119
| -rw-r--r-- | glib/gunicollate.c | 2 | ||||
| -rw-r--r-- | glib/tests/once.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/glib/gunicollate.c b/glib/gunicollate.c index d54ef19ed..dfed1041d 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -441,7 +441,7 @@ g_utf8_collate_key (const gchar *str, if (str_locale) { 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); str_locale = NULL; diff --git a/glib/tests/once.c b/glib/tests/once.c index 8fc8d5014..ea521c05b 100644 --- a/glib/tests/once.c +++ b/glib/tests/once.c @@ -192,7 +192,7 @@ test_once_init_multi_threaded (void) static 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"); |