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

gstrfuncs: Add back x + !x warning workaround

Browse Source 
We thought we could drop the x + !x workaround in
commit eea87eff3f6c208d4b46282f82e8f3c6ad3547b0 but apparently
not.

This commit adds it back, but with an added layer of indirection,
for aesthetics.

Closes: #2807
This commit is contained in:
Ray Strode 2022-11-04 13:10:40 -04:00
parent 05750454d5
commit 48730d2b30
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glib/gstrfuncs.h
View File

@ -148,6 +148,12 @@ gboolean (g_str_has_prefix) (const gchar *str,
#if G_GNUC_CHECK_VERSION (2, 0) #if G_GNUC_CHECK_VERSION (2, 0)
/* This macro is defeat a false -Wnonnull warning in GCC.
* Without it, it thinks strlen and memcmp may be getting passed NULL
* despite the explicit check for NULL right above the calls.
*/
#define _G_STR_NONNULL(x) (x + !x)
#define g_str_has_prefix(STR, PREFIX) \ #define g_str_has_prefix(STR, PREFIX) \
(__builtin_constant_p (PREFIX)? \ (__builtin_constant_p (PREFIX)? \
G_GNUC_EXTENSION ({ \ G_GNUC_EXTENSION ({ \
@ -159,11 +165,11 @@ gboolean (g_str_has_prefix) (const gchar *str,
__result = (g_str_has_prefix) (__str, __prefix); \ __result = (g_str_has_prefix) (__str, __prefix); \
else \ else \
{ \ { \
const size_t __str_len = strlen (__str); \ const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \
const size_t __prefix_len = strlen (__prefix); \ const size_t __prefix_len = strlen (_G_STR_NONNULL (__prefix)); \
if (__str_len >= __prefix_len) \ if (__str_len >= __prefix_len) \
__result = memcmp (__str, \ __result = memcmp (_G_STR_NONNULL (__str), \
__prefix, \ _G_STR_NONNULL (__prefix), \
__prefix_len) == 0; \ __prefix_len) == 0; \
} \ } \
__result; \ __result; \
@ -183,11 +189,12 @@ gboolean (g_str_has_prefix) (const gchar *str,
__result = (g_str_has_suffix) (__str, __suffix); \ __result = (g_str_has_suffix) (__str, __suffix); \
else \ else \
{ \ { \
const size_t __str_len = strlen (__str); \ const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \
const size_t __suffix_len = strlen (__suffix); \ const size_t __suffix_len = strlen (_G_STR_NONNULL (__suffix)); \
if (__str_len >= __suffix_len) \ if (__str_len >= __suffix_len) \
__result = memcmp (__str + __str_len - __suffix_len, \ __result = memcmp (__str + __str_len - __suffix_len, \
__suffix, __suffix_len) == 0; \ _G_STR_NONNULL (__suffix), \
__suffix_len) == 0; \
} \ } \
__result; \ __result; \
}) \ }) \