fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-22 03:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib-aux: add nm_strv_equal_n_null() helper (and related)

Browse source 
The plain nm_strv_equal(), nm_strv_equal_n(), nm_strv_cmp_n() functions
treat NULL strv arrays (without specified length) different than strv
arrays of length zero. They do so, because that is useful sometimes.

Sometimes it is not useful and we want to treat empty arrays the same
as a NULL array. Add helpers for that.
This commit is contained in:
Thomas Haller 2021-09-29 19:02:32 +02:00
parent c32ddc30c0
commit 8ad4f7b70f
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libnm-glib-aux/nm-shared-utils.h
View file

@ -2330,7 +2330,28 @@ int _nm_strv_cmp_n(const char *const *strv1, gssize len1, const char *const *str
#define nm_strv_cmp_n(strv1, len1, strv2, len2) \
_nm_strv_cmp_n(NM_CAST_STRV_CC(strv1), (len1), NM_CAST_STRV_CC(strv2), (len2))
#define nm_strv_equal(strv1, strv2) (nm_strv_cmp_n((strv1), -1, (strv2), -1) == 0)
/* This is like nm_strv_cmp_n(). The difference is that a NULL strv array (strv=NULL,len=-1)
* is treated the same as an empty one (with len=0). */
#define nm_strv_cmp_n_null(strv1, len1, strv2, len2) \
({ \
const char *const *const _strv1 = NM_CAST_STRV_CC(strv1); \
const char *const *const _strv2 = NM_CAST_STRV_CC(strv2); \
const gssize _len1 = (len1); \
const gssize _len2 = (len2); \
\
_nm_strv_cmp_n(_strv1, \
(_len1 >= 0 ? _len1 : (_strv1 ? -1 : 0)), \
_strv2, \
(_len2 >= 0 ? _len2 : (_strv2 ? -1 : 0))); \
})
#define nm_strv_equal_n(strv1, len1, strv2, len2) \
(nm_strv_cmp_n((strv1), (len1), (strv2), (len2)) == 0)
#define nm_strv_equal(strv1, strv2) nm_strv_equal_n((strv1), -1, (strv2), -1)
#define nm_strv_equal_n_null(strv1, len1, strv2, len2) \
(nm_strv_cmp_n_null((strv1), (len1), (strv2), (len2)) == 0)
/*****************************************************************************/