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

Merge branch 'work-back-in-the-work-around' into 'main'

Browse Source 
Fix build with -Werror=nonnull

Closes #2807

See merge request GNOME/glib!3057
This commit is contained in:
Michael Catanzaro 2022-11-04 17:33:00 +00:00
commit 79b06ab34f
1 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
glib/gstrfuncs.h
View File

@ -148,53 +148,58 @@ gboolean (g_str_has_prefix) (const gchar *str,
#if G_GNUC_CHECK_VERSION (2, 0)
#define g_str_has_prefix(STR, PREFIX) \
(__builtin_constant_p (PREFIX)? \
G_GNUC_EXTENSION ({ \
const char * const __str = (STR); \
const char * const __prefix = (PREFIX); \
\
(G_UNLIKELY (__str == NULL || __prefix == NULL) ? \
(g_str_has_prefix) (__str, __prefix) \
: \
({ \
const size_t __str_len = strlen (__str); \
const size_t __prefix_len = strlen (__prefix); \
((__str_len >= __prefix_len) ? \
memcmp (__str, __prefix, __prefix_len) == 0 \
: \
FALSE \
); \
}) \
); \
}) \
: \
(g_str_has_prefix) (STR, PREFIX) \
/* 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) \
(__builtin_constant_p (PREFIX)? \
G_GNUC_EXTENSION ({ \
const char * const __str = (STR); \
const char * const __prefix = (PREFIX); \
gboolean __result = FALSE; \
\
if G_UNLIKELY (__str == NULL || __prefix == NULL) \
__result = (g_str_has_prefix) (__str, __prefix); \
else \
{ \
const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \
const size_t __prefix_len = strlen (_G_STR_NONNULL (__prefix)); \
if (__str_len >= __prefix_len) \
__result = memcmp (_G_STR_NONNULL (__str), \
_G_STR_NONNULL (__prefix), \
__prefix_len) == 0; \
} \
__result; \
}) \
: \
(g_str_has_prefix) (STR, PREFIX) \
)
#define g_str_has_suffix(STR, SUFFIX) \
(__builtin_constant_p (SUFFIX)? \
G_GNUC_EXTENSION ({ \
const char * const __str = STR; \
const char * const __suffix = SUFFIX; \
\
((__str == NULL || __suffix == NULL) ? \
(g_str_has_suffix) (__str, __suffix) \
: \
({ \
const size_t __str_len = strlen (__str); \
const size_t __suffix_len = strlen (__suffix); \
((__str_len >= __suffix_len) ? \
memcmp (__str + __str_len - __suffix_len, \
__suffix, __suffix_len) == 0 \
: \
FALSE \
); \
}) \
); \
}) \
: \
(g_str_has_suffix) (STR, SUFFIX) \
#define g_str_has_suffix(STR, SUFFIX) \
(__builtin_constant_p (SUFFIX)? \
G_GNUC_EXTENSION ({ \
const char * const __str = (STR); \
const char * const __suffix = (SUFFIX); \
gboolean __result = FALSE; \
\
if G_UNLIKELY (__str == NULL || __suffix == NULL) \
__result = (g_str_has_suffix) (__str, __suffix); \
else \
{ \
const size_t __str_len = strlen (_G_STR_NONNULL (__str)); \
const size_t __suffix_len = strlen (_G_STR_NONNULL (__suffix)); \
if (__str_len >= __suffix_len) \
__result = memcmp (__str + __str_len - __suffix_len, \
_G_STR_NONNULL (__suffix), \
__suffix_len) == 0; \
} \
__result; \
}) \
: \
(g_str_has_suffix) (STR, SUFFIX) \
)
#endif /* G_GNUC_CHECK_VERSION (2, 0) */