system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-04 15:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: mark "nm_platform_iter_obj_for_each()"/"nm_l3_config_data_iter_*()" as ForEachMacros

Browse source
This commit is contained in:
Thomas Haller 2020-10-13 12:48:09 +02:00
parent ae31b4bf4e
commit 6807774b7d
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.clang-format
View file

@ -99,10 +99,16 @@ ForEachMacros: ['c_list_for_each',
'nm_ip_config_iter_ip6_route_for_each',
'nm_json_array_foreach',
'nm_json_object_foreach',
'nm_l3_config_data_iter_ip4_address_for_each',
'nm_l3_config_data_iter_ip4_route_for_each',
'nm_l3_config_data_iter_ip6_address_for_each',
'nm_l3_config_data_iter_ip6_route_for_each',
'nm_l3_config_data_iter_obj_for_each',
'nm_manager_for_each_active_connection',
'nm_manager_for_each_active_connection_safe',
'nm_manager_for_each_device',
'nm_manager_for_each_device_safe',
'nm_platform_iter_obj_for_each',
'nmp_cache_iter_for_each',
'nmp_cache_iter_for_each_link',
]

57
src/nm-l3-config-data.c
View file

@ -385,8 +385,10 @@ nm_l3_config_data_log(const NML3ConfigData *self,
const NMPObject *obj;
i = 0;
nm_l3_config_data_iter_obj_for_each(&iter, self, &obj, NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
self,
&obj,
NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4)) {
_L("address%c[%u]: %s",
nm_utils_addr_family_to_char(addr_family),
i,
@ -407,8 +409,7 @@ nm_l3_config_data_log(const NML3ConfigData *self,
}
i = 0;
nm_l3_config_data_iter_obj_for_each(&iter, self, &obj, NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter, self, &obj, NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4)) {
_L("route%c[%u]: %s%s",
nm_utils_addr_family_to_char(addr_family),
i,
@ -914,8 +915,7 @@ nm_l3_config_data_has_routes_with_type_local(const NML3ConfigData *self, int add
}
val = FALSE;
nm_l3_config_data_iter_obj_for_each(&iter, self, &obj, NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter, self, &obj, NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4)) {
if (NMP_OBJECT_CAST_IP_ROUTE(obj)->type_coerced
== nm_platform_route_type_coerce(RTN_LOCAL)) {
val = TRUE;
@ -989,8 +989,7 @@ nm_l3_config_data_get_first_obj(const NML3ConfigData *self,
nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
nm_l3_config_data_iter_obj_for_each(&iter, self, &obj, obj_type)
{
nm_l3_config_data_iter_obj_for_each (&iter, self, &obj, obj_type) {
if (!predicate || predicate(obj))
return obj;
}
@ -1880,11 +1879,10 @@ _data_get_direct_route_for_host(const NML3ConfigData *self,
if (nm_ip_addr_is_null(addr_family, host))
return NULL;
nm_l3_config_data_iter_obj_for_each(&ipconf_iter,
self,
&item_obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&ipconf_iter,
self,
&item_obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4)) {
const NMPlatformIPXRoute *item = NMP_OBJECT_CAST_IPX_ROUTE(item_obj);
if (nm_ip_addr_is_null(addr_family,
@ -1941,8 +1939,7 @@ nm_l3_config_data_get_blacklisted_ip4_routes(const NML3ConfigData *self, gboolea
* As we don't do that for IPv4 and manual IPv6 addresses. Add them here
* as dependent routes. */
nm_l3_config_data_iter_obj_for_each(&iter, self, &my_addr_obj, NMP_OBJECT_TYPE_IP4_ADDRESS)
{
nm_l3_config_data_iter_obj_for_each (&iter, self, &my_addr_obj, NMP_OBJECT_TYPE_IP4_ADDRESS) {
const NMPlatformIP4Address *const my_addr = NMP_OBJECT_CAST_IP4_ADDRESS(my_addr_obj);
in_addr_t network_4;
NMPlatformIPXRoute rx;
@ -2033,11 +2030,10 @@ nm_l3_config_data_add_dependent_routes(NML3ConfigData *self,
nm_l3_config_data_add_route(self, addr_family, NULL, &rx.rx);
}
nm_l3_config_data_iter_obj_for_each(&iter,
self,
&my_addr_obj,
NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
self,
&my_addr_obj,
NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4)) {
const NMPlatformIPXAddress *const my_addr = NMP_OBJECT_CAST_IPX_ADDRESS(my_addr_obj);
if (my_addr->ax.external)
@ -2152,11 +2148,10 @@ nm_l3_config_data_add_dependent_routes(NML3ConfigData *self,
}
}
nm_l3_config_data_iter_obj_for_each(&iter,
self,
&my_route_obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
self,
&my_route_obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4)) {
const NMPlatformIPXRoute *my_route = NMP_OBJECT_CAST_IPX_ROUTE(my_route_obj);
NMPObject * new_route;
NMPlatformIPXRoute * new_r;
@ -2547,8 +2542,10 @@ nm_l3_config_data_merge(NML3ConfigData * self,
const NML3ConfigDatFlags has_dns_priority_flag =
NM_L3_CONFIG_DAT_FLAGS_HAS_DNS_PRIORITY(IS_IPv4);
nm_l3_config_data_iter_obj_for_each(&iter, src, &obj, NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
src,
&obj,
NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4)) {
if (hook_add_addr && !hook_add_addr(src, obj, hook_user_data))
continue;
@ -2561,8 +2558,10 @@ nm_l3_config_data_merge(NML3ConfigData * self,
}
if (!NM_FLAGS_HAS(merge_flags, NM_L3_CONFIG_MERGE_FLAGS_NO_ROUTES)) {
nm_l3_config_data_iter_obj_for_each(&iter, src, &obj, NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
src,
&obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4)) {
const NMPlatformIPRoute *r_src = NMP_OBJECT_CAST_IP_ROUTE(obj);
NMPlatformIPXRoute r;

23
src/nm-l3cfg.c
View file

@ -565,19 +565,17 @@ _l3cfg_externally_removed_objs_pickup(NML3Cfg *self, int addr_family)
if (!self->priv.p->combined_l3cd_commited)
return;
nm_l3_config_data_iter_obj_for_each(&iter,
self->priv.p->combined_l3cd_commited,
&obj,
NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
self->priv.p->combined_l3cd_commited,
&obj,
NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4)) {
if (!nm_platform_lookup_entry(self->priv.platform, NMP_CACHE_ID_TYPE_OBJECT_TYPE, obj))
_l3cfg_externally_removed_objs_track(self, obj, TRUE);
}
nm_l3_config_data_iter_obj_for_each(&iter,
self->priv.p->combined_l3cd_commited,
&obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4))
{
nm_l3_config_data_iter_obj_for_each (&iter,
self->priv.p->combined_l3cd_commited,
&obj,
NMP_OBJECT_TYPE_IP_ROUTE(IS_IPv4)) {
if (!nm_platform_lookup_entry(self->priv.platform, NMP_CACHE_ID_TYPE_OBJECT_TYPE, obj))
_l3cfg_externally_removed_objs_track(self, obj, TRUE);
}
@ -1410,7 +1408,7 @@ _l3_acd_data_add_all(NML3Cfg *self, const L3ConfigData *const *infos, guint info
NMDedupMultiIter iter;
const NMPObject * obj;
nm_l3_config_data_iter_obj_for_each(&iter, info->l3cd, &obj, NMP_OBJECT_TYPE_IP4_ADDRESS)
nm_l3_config_data_iter_obj_for_each (&iter, info->l3cd, &obj, NMP_OBJECT_TYPE_IP4_ADDRESS)
_l3_acd_data_add(self, info->l3cd, obj, info->tag, info->acd_timeout_msec);
}
@ -3220,8 +3218,7 @@ nm_l3cfg_has_commited_ip6_addresses_pending_dad(NML3Cfg *self)
nmp_lookup_init_object(&plat_lookup, NMP_OBJECT_TYPE_IP6_ADDRESS, self->priv.ifindex);
nm_platform_iter_obj_for_each(&iter, self->priv.platform, &plat_lookup, &plat_obj)
{
nm_platform_iter_obj_for_each (&iter, self->priv.platform, &plat_lookup, &plat_obj) {
const NMPlatformIP6Address *plat_addr = NMP_OBJECT_CAST_IP6_ADDRESS(plat_obj);
const NMDedupMultiEntry * l3cd_entry;

3
src/platform/tests/test-common.c
View file

@ -99,8 +99,7 @@ nmtstp_platform_ip_address_find(NMPlatform *self, int ifindex, int addr_family,
nm_assert(addr);
nmp_lookup_init_object(&lookup, NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4), ifindex);
nm_platform_iter_obj_for_each(&iter, self, &lookup, &obj)
{
nm_platform_iter_obj_for_each (&iter, self, &lookup, &obj) {
const NMPlatformIPAddress *a = NMP_OBJECT_CAST_IP_ADDRESS(obj);
g_assert(NMP_OBJECT_GET_ADDR_FAMILY(obj) == addr_family);