fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 08:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: add NM_STR_HAS_SUFFIX_WITH_MORE()/NM_STR_HAS_SUFFIX_ASCII_CASE_WITH_MORE() macros

Browse source 
They are like NM_STR_HAS_SUFFIX()/NM_STR_HAS_SUFFIX_ASCII_CASE(), but require that
the checked string is not identical to the suffix. They require some non-empty word
preceding the suffix.
This commit is contained in:
Thomas Haller 2020-08-07 11:22:05 +02:00
parent 07264a5dc1
commit cc8da77637
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
shared/nm-glib-aux/nm-macros-internal.h
View file

@ -1250,9 +1250,21 @@ _NM_IN_STRSET_ASCII_CASE_op_streq (const char *x, const char *s)
\
( _str_has_suffix \
&& ((_l = strlen (_str_has_suffix)) >= NM_STRLEN (suffix)) \
&& (g_ascii_strncasecmp (&_str_has_suffix[_l - NM_STRLEN (suffix)], \
""suffix"", \
NM_STRLEN (suffix)) == 0)); \
&& (g_ascii_strcasecmp (&_str_has_suffix[_l - NM_STRLEN (suffix)], \
""suffix"") == 0)); \
})
#define NM_STR_HAS_SUFFIX_ASCII_CASE_WITH_MORE(str, suffix) \
({ \
const char *const _str_has_suffix = (str); \
size_t _l; \
\
nm_assert (strlen (suffix) == NM_STRLEN (suffix)); \
\
( _str_has_suffix \
&& ((_l = strlen (_str_has_suffix)) > NM_STRLEN (suffix)) \
&& (g_ascii_strcasecmp (&_str_has_suffix[_l - NM_STRLEN (suffix)], \
""suffix"") == 0)); \
})
/*****************************************************************************/

14
shared/nm-std-aux/nm-std-aux.h
View file

@ -321,6 +321,20 @@ nm_streq0 (const char *s1, const char *s2)
&& _str_has_prefix_with_more[NM_STRLEN (prefix)] != '\0'; \
})
#define NM_STR_HAS_SUFFIX_WITH_MORE(str, suffix) \
({ \
const char *const _str_has_suffix = (str); \
size_t _l; \
\
nm_assert (strlen (suffix) == NM_STRLEN (suffix)); \
\
( _str_has_suffix \
&& ((_l = strlen (_str_has_suffix)) > NM_STRLEN (suffix)) \
&& (memcmp (&_str_has_suffix[_l - NM_STRLEN (suffix)], \
""suffix"", \
NM_STRLEN (suffix)) == 0)); \
})
/*****************************************************************************/
#define _NM_IN_SET_EVAL_1( op, _x, y) (_x == (y))