fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 01:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

std-aux: use unique temporary variable in NM_IS_IPv4()

Browse source 
NM_IS_IPv4() should work well, also inside other macros and not
be concerned about shadowing another variable.
This commit is contained in:
Thomas Haller 2021-08-05 13:18:24 +02:00
parent 4513d4db63
commit 7459a8c67a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libnm-std-aux/nm-std-aux.h
View file

@ -1152,15 +1152,17 @@ nm_utils_addr_family_to_char(int addr_family)
#define nm_assert_addr_family(addr_family) \
nm_assert(NM_IN_SET((addr_family), NM_AF_INET, NM_AF_INET6))
#define NM_IS_IPv4(addr_family) \
({ \
const int _addr_family = (addr_family); \
\
nm_assert_addr_family(_addr_family); \
\
(_addr_family == NM_AF_INET); \
#define _NM_IS_IPv4(uniq, addr_family) \
({ \
const int NM_UNIQ_T(_addr_family, uniq) = (addr_family); \
\
nm_assert_addr_family(NM_UNIQ_T(_addr_family, uniq)); \
\
(NM_UNIQ_T(_addr_family, uniq) == NM_AF_INET); \
})
#define NM_IS_IPv4(addr_family) _NM_IS_IPv4(NM_UNIQ, addr_family)
static inline size_t
nm_utils_addr_family_to_size(int addr_family)
{