fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 16:20:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: rename RefreshAllInfo.addr_family to "addr_family_for_dump"

Browse source 
The term "addr_family" is used very frequently, and it usually is an
auto variable or a function parameter.

It is interesting to search where this field is used. So rename to give
it a unique (and better fitting) name.

While at it, use gint8 to encode the addr_family. It's always
sufficient, and this reduces the size of RefreshAllInfo from 8 bytes
to two.
This commit is contained in:
Thomas Haller 2022-07-07 13:31:51 +02:00
parent 3b58404712
commit baecadbe98
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-platform/nm-linux-platform.c
View file

@ -318,8 +318,9 @@ typedef enum {
typedef struct {
NMPObjectType obj_type;
/* for NLM_F_DUMP, which address family to request. */
int addr_family;
/* For NLM_F_DUMP, which address family to request.
* Either AF_UNSPEC, AF_INET or AF_INET6. */
gint8 addr_family_for_dump;
} RefreshAllInfo;
typedef enum {
@ -5799,8 +5800,8 @@ refresh_all_type_get_info(RefreshAllType refresh_all_type)
static const RefreshAllInfo infos[] = {
#define R(_refresh_all_type, _obj_type, _addr_family) \
[_refresh_all_type] = { \
.obj_type = _obj_type, \
.addr_family = _addr_family, \
.obj_type = _obj_type, \
.addr_family_for_dump = _addr_family, \
}
R(REFRESH_ALL_TYPE_LINKS, NMP_OBJECT_TYPE_LINK, AF_UNSPEC),
R(REFRESH_ALL_TYPE_IP4_ADDRESSES, NMP_OBJECT_TYPE_IP4_ADDRESS, AF_UNSPEC),
@ -5902,11 +5903,11 @@ refresh_all_type_init_lookup(RefreshAllType refresh_all_type, NMPLookup *lookup)
if (NM_IN_SET(refresh_all_info->obj_type, NMP_OBJECT_TYPE_ROUTING_RULE)) {
return nmp_lookup_init_object_by_addr_family(lookup,
refresh_all_info->obj_type,
refresh_all_info->addr_family);
refresh_all_info->addr_family_for_dump);
}
/* not yet implemented. */
nm_assert(refresh_all_info->addr_family == AF_UNSPEC);
nm_assert(refresh_all_info->addr_family_for_dump == AF_UNSPEC);
return nmp_lookup_init_obj_type(lookup, refresh_all_info->obj_type);
}
@ -6927,7 +6928,8 @@ do_request_all_no_delayed_actions(NMPlatform *platform, DelayedActionType action
event_handler_read_netlink(platform, FALSE);
nlmsg = _nl_msg_new_dump(refresh_all_info->obj_type, refresh_all_info->addr_family);
nlmsg =
_nl_msg_new_dump(refresh_all_info->obj_type, refresh_all_info->addr_family_for_dump);
if (!nlmsg)
goto next_after_fail;