colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: allow NULL argument to nm-ip-config's for-each macros

Browse Source 
Allow omitting the platform output argument. One can use the iterator to
access the current entry.
This commit is contained in:
Thomas Haller
2017-08-30 17:39:40 +02:00
parent abcc74e0b5
commit 6e9aa9402a
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nm-ip4-config.h
View File

@@ -46,10 +46,8 @@ nm_ip_config_iter_ip4_address_next (NMDedupMultiIter *ipconf_iter, const NMPlatf
{
gboolean has_next;
g_return_val_if_fail (out_address, FALSE);
has_next = nm_dedup_multi_iter_next (ipconf_iter);
if (has_next)
if (has_next && out_address)
*out_address = NMP_OBJECT_CAST_IP4_ADDRESS (ipconf_iter->current->obj);
return has_next;
}
@@ -59,21 +57,19 @@ nm_ip_config_iter_ip4_route_next (NMDedupMultiIter *ipconf_iter, const NMPlatfor
{
gboolean has_next;
g_return_val_if_fail (out_route, FALSE);
has_next = nm_dedup_multi_iter_next (ipconf_iter);
if (has_next)
if (has_next && out_route)
*out_route = NMP_OBJECT_CAST_IP4_ROUTE (ipconf_iter->current->obj);
return has_next;
}
#define nm_ip_config_iter_ip4_address_for_each(iter, self, address) \
for (*(address) = NULL, nm_ip_config_iter_ip4_address_init ((iter), (self)); \
for (({ if (address) { *((const NMPlatformIP4Address **) (address)) = NULL; } }), nm_ip_config_iter_ip4_address_init ((iter), (self)); \
nm_ip_config_iter_ip4_address_next ((iter), (address)); \
)
#define nm_ip_config_iter_ip4_route_for_each(iter, self, route) \
for (*(route) = NULL, nm_ip_config_iter_ip4_route_init ((iter), (self)); \
for (({ if (route) { *((const NMPlatformIP4Route **) (route)) = NULL; } }), nm_ip_config_iter_ip4_route_init ((iter), (self)); \
nm_ip_config_iter_ip4_route_next ((iter), (route)); \
)

12
src/nm-ip6-config.h
View File

@@ -39,10 +39,8 @@ nm_ip_config_iter_ip6_address_next (NMDedupMultiIter *ipconf_iter, const NMPlatf
{
gboolean has_next;
g_return_val_if_fail (out_address, FALSE);
has_next = nm_dedup_multi_iter_next (ipconf_iter);
if (has_next)
if (has_next && out_address)
*out_address = NMP_OBJECT_CAST_IP6_ADDRESS (ipconf_iter->current->obj);
return has_next;
}
@@ -52,21 +50,19 @@ nm_ip_config_iter_ip6_route_next (NMDedupMultiIter *ipconf_iter, const NMPlatfor
{
gboolean has_next;
g_return_val_if_fail (out_route, FALSE);
has_next = nm_dedup_multi_iter_next (ipconf_iter);
if (has_next)
if (has_next && out_route)
*out_route = NMP_OBJECT_CAST_IP6_ROUTE (ipconf_iter->current->obj);
return has_next;
}
#define nm_ip_config_iter_ip6_address_for_each(iter, self, address) \
for (*(address) = NULL, nm_ip_config_iter_ip6_address_init ((iter), (self)); \
for (({ if (address) { *(((const NMPlatformIP6Address **) address)) = NULL; } }), nm_ip_config_iter_ip6_address_init ((iter), (self)); \
nm_ip_config_iter_ip6_address_next ((iter), (address)); \
)
#define nm_ip_config_iter_ip6_route_for_each(iter, self, route) \
for (*(route) = NULL, nm_ip_config_iter_ip6_route_init ((iter), (self)); \
for (({ if (route) { *((const NMPlatformIP6Route **) (route)) = NULL; } }), nm_ip_config_iter_ip6_route_init ((iter), (self)); \
nm_ip_config_iter_ip6_route_next ((iter), (route)); \
)