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

platform: rework nm_platform_dedup_multi_iter_next_*() and add more implementations

Browse source 
I want to add more such accessors, because they are the base for
the corresponding for-each macros.

Add a helper macro _nm_platform_dedup_multi_iter_next() to do that,
which should make it simpler to add these nm_platform_dedup_multi_iter_next*()
functions.

Note that previously these functions were inline functions, now they are
macros. I think there is very little difference here. Also before those
functions could be entirely inlined. By using the macro the result
doesn't really change.

One difference is that we now require an "out" pointer. Previously that
was not required, but I guess it makes little sense otherwise.
This commit is contained in:
Thomas Haller 2020-11-20 20:25:38 +01:00
parent eed23269bd
commit a6456fe1f4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 53 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/platform/nmp-object.h
View file

@ -1077,52 +1077,64 @@ nm_platform_dedup_multi_iter_next_obj(NMDedupMultiIter *ipconf_iter,
return has_next;
}
static inline gboolean
nm_platform_dedup_multi_iter_next_ip4_address(NMDedupMultiIter * ipconf_iter,
const NMPlatformIP4Address **out_address)
{
gboolean has_next;
#define _nm_platform_dedup_multi_iter_next(ipconf_iter, out_obj, field, ...) \
({ \
NMDedupMultiIter *const _ipconf_iter = (ipconf_iter); \
const typeof(((NMPObject *) NULL)->field) **const _out_obj = (out_obj); \
gboolean _has_next; \
\
if (G_LIKELY(nm_dedup_multi_iter_next(_ipconf_iter))) { \
if (_out_obj) { \
*_out_obj = _NMP_OBJECT_CAST(_ipconf_iter->current->obj, field, __VA_ARGS__); \
} else { \
nm_assert( \
NM_IN_SET(NMP_OBJECT_GET_TYPE(_ipconf_iter->current->obj), __VA_ARGS__)); \
} \
_has_next = TRUE; \
} else { \
if (_out_obj) \
*_out_obj = NULL; \
_has_next = FALSE; \
} \
_has_next; \
})
has_next = nm_dedup_multi_iter_next(ipconf_iter);
if (out_address)
*out_address = has_next ? NMP_OBJECT_CAST_IP4_ADDRESS(ipconf_iter->current->obj) : NULL;
return has_next;
}
#define nm_platform_dedup_multi_iter_next_ip_address(ipconf_iter, out_obj) \
_nm_platform_dedup_multi_iter_next((ipconf_iter), \
(out_obj), \
ip_address, \
NMP_OBJECT_TYPE_IP4_ADDRESS, \
NMP_OBJECT_TYPE_IP6_ADDRESS)
static inline gboolean
nm_platform_dedup_multi_iter_next_ip4_route(NMDedupMultiIter * ipconf_iter,
const NMPlatformIP4Route **out_route)
{
gboolean has_next;
#define nm_platform_dedup_multi_iter_next_ip4_address(ipconf_iter, out_obj) \
_nm_platform_dedup_multi_iter_next((ipconf_iter), \
(out_obj), \
ip4_address, \
NMP_OBJECT_TYPE_IP4_ADDRESS)
has_next = nm_dedup_multi_iter_next(ipconf_iter);
if (out_route)
*out_route = has_next ? NMP_OBJECT_CAST_IP4_ROUTE(ipconf_iter->current->obj) : NULL;
return has_next;
}
#define nm_platform_dedup_multi_iter_next_ip6_address(ipconf_iter, out_obj) \
_nm_platform_dedup_multi_iter_next((ipconf_iter), \
(out_obj), \
ip6_address, \
NMP_OBJECT_TYPE_IP6_ADDRESS)
static inline gboolean
nm_platform_dedup_multi_iter_next_ip6_address(NMDedupMultiIter * ipconf_iter,
const NMPlatformIP6Address **out_address)
{
gboolean has_next;
#define nm_platform_dedup_multi_iter_next_ip_route(ipconf_iter, out_obj) \
_nm_platform_dedup_multi_iter_next((ipconf_iter), \
(out_obj), \
ip_route, \
NMP_OBJECT_TYPE_IP4_ROUTE, \
NMP_OBJECT_TYPE_IP6_ROUTE)
has_next = nm_dedup_multi_iter_next(ipconf_iter);
if (out_address)
*out_address = has_next ? NMP_OBJECT_CAST_IP6_ADDRESS(ipconf_iter->current->obj) : NULL;
return has_next;
}
#define nm_platform_dedup_multi_iter_next_ip4_route(ipconf_iter, out_obj) \
_nm_platform_dedup_multi_iter_next((ipconf_iter), \
(out_obj), \
ip4_route, \
NMP_OBJECT_TYPE_IP4_ROUTE)
static inline gboolean
nm_platform_dedup_multi_iter_next_ip6_route(NMDedupMultiIter * ipconf_iter,
const NMPlatformIP6Route **out_route)
{
gboolean has_next;
has_next = nm_dedup_multi_iter_next(ipconf_iter);
if (out_route)
*out_route = has_next ? NMP_OBJECT_CAST_IP6_ROUTE(ipconf_iter->current->obj) : NULL;
return has_next;
}
#define nm_platform_dedup_multi_iter_next_ip6_route(ipconf_iter, out_obj) \
_nm_platform_dedup_multi_iter_next((ipconf_iter), \
(out_obj), \
ip6_route, \
NMP_OBJECT_TYPE_IP6_ROUTE)
#endif /* __NMP_OBJECT_H__ */