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

core: change NM_IS_IP_CONFIG() to have no additional argument

Browse Source 
NM_IS_IP_CONFIG() is a standard name for GObject related macros. Next,
we will add NMIPConfig object, so this macro (and name) will have a use.

Rename, and adjust the existing macro to avoid the name conflict.
This commit is contained in:
Thomas Haller
2020-07-29 21:33:16 +02:00
parent fea6be41cc
commit adec7bd887
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/nm-device.c
View File

@@ -1247,7 +1247,7 @@ applied_config_init (AppliedConfig *config, gpointer ip_config)
|| (!config->orig && !config->current) || (!config->orig && !config->current)
|| nm_ip_config_get_addr_family (ip_config) == nm_ip_config_get_addr_family (config->orig ?: config->current)); || nm_ip_config_get_addr_family (ip_config) == nm_ip_config_get_addr_family (config->orig ?: config->current));
nm_assert ( !ip_config nm_assert ( !ip_config
|| NM_IS_IP_CONFIG (ip_config, AF_UNSPEC)); || NM_IS_IP_CONFIG (ip_config));
nm_g_object_ref (ip_config); nm_g_object_ref (ip_config);
applied_config_clear (config); applied_config_clear (config);

2
src/dhcp/nm-dhcp-client.c
View File

@@ -428,7 +428,7 @@ nm_dhcp_client_set_state (NMDhcpClient *self,
gs_free char *event_id = NULL; gs_free char *event_id = NULL;
if (NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) { if (NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) {
g_return_if_fail (NM_IS_IP_CONFIG (ip_config, priv->addr_family)); g_return_if_fail (NM_IS_IP_CONFIG_ADDR_FAMILY (ip_config, priv->addr_family));
g_return_if_fail (options); g_return_if_fail (options);
} else { } else {
g_return_if_fail (!ip_config); g_return_if_fail (!ip_config);

6
src/dns/nm-dns-manager.c
View File

@@ -215,7 +215,7 @@ _ASSERT_ip_config_data (const NMDnsIPConfigData *ip_data)
{ {
nm_assert (ip_data); nm_assert (ip_data);
_ASSERT_config_data (ip_data->data); _ASSERT_config_data (ip_data->data);
nm_assert (NM_IS_IP_CONFIG (ip_data->ip_config, AF_UNSPEC)); nm_assert (NM_IS_IP_CONFIG (ip_data->ip_config));
nm_assert (c_list_contains (&ip_data->data->data_lst_head, &ip_data->data_lst)); nm_assert (c_list_contains (&ip_data->data->data_lst_head, &ip_data->data_lst));
nm_assert (ip_data->data->ifindex == nm_ip_config_get_ifindex (ip_data->ip_config)); nm_assert (ip_data->data->ifindex == nm_ip_config_get_ifindex (ip_data->ip_config));
} }
@@ -228,7 +228,7 @@ _ip_config_data_new (NMDnsConfigData *data,
NMDnsIPConfigData *ip_data; NMDnsIPConfigData *ip_data;
_ASSERT_config_data (data); _ASSERT_config_data (data);
nm_assert (NM_IS_IP_CONFIG (ip_config, AF_UNSPEC)); nm_assert (NM_IS_IP_CONFIG (ip_config));
nm_assert (ip_config_type != NM_DNS_IP_CONFIG_TYPE_REMOVED); nm_assert (ip_config_type != NM_DNS_IP_CONFIG_TYPE_REMOVED);
ip_data = g_slice_new0 (NMDnsIPConfigData); ip_data = g_slice_new0 (NMDnsIPConfigData);
@@ -1644,7 +1644,7 @@ nm_dns_manager_set_ip_config (NMDnsManager *self,
NMDnsIPConfigData **p_best; NMDnsIPConfigData **p_best;
g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE); g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE);
g_return_val_if_fail (NM_IS_IP_CONFIG (ip_config, AF_UNSPEC), FALSE); g_return_val_if_fail (NM_IS_IP_CONFIG (ip_config), FALSE);
ifindex = nm_ip_config_get_ifindex (ip_config); ifindex = nm_ip_config_get_ifindex (ip_config);
g_return_val_if_fail (ifindex > 0, FALSE); g_return_val_if_fail (ifindex > 0, FALSE);

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

@@ -262,7 +262,7 @@ void nm_ip_config_dump (const NMIPConfig *self,
#include "nm-ip6-config.h" #include "nm-ip6-config.h"
static inline gboolean static inline gboolean
NM_IS_IP_CONFIG (gconstpointer config, int addr_family) NM_IS_IP_CONFIG_ADDR_FAMILY (gconstpointer config, int addr_family)
{ {
if (addr_family == AF_UNSPEC) if (addr_family == AF_UNSPEC)
return NM_IS_IP4_CONFIG (config) || NM_IS_IP6_CONFIG (config); return NM_IS_IP4_CONFIG (config) || NM_IS_IP6_CONFIG (config);
@@ -273,6 +273,8 @@ NM_IS_IP_CONFIG (gconstpointer config, int addr_family)
g_return_val_if_reached (FALSE); g_return_val_if_reached (FALSE);
} }
#define NM_IS_IP_CONFIG(config) NM_IS_IP_CONFIG_ADDR_FAMILY ((config), AF_UNSPEC)
#if _NM_CC_SUPPORT_GENERIC #if _NM_CC_SUPPORT_GENERIC
/* _NM_IS_IP_CONFIG() is a bit unusual. If _Generic() is supported, /* _NM_IS_IP_CONFIG() is a bit unusual. If _Generic() is supported,
* it checks whether @config is either NM_IS_IP4_CONFIG() or NM_IS_IP6_CONFIG(), * it checks whether @config is either NM_IS_IP4_CONFIG() or NM_IS_IP6_CONFIG(),
@@ -307,7 +309,7 @@ NM_IS_IP_CONFIG (gconstpointer config, int addr_family)
NMIP6Config * : (NM_IS_IP6_CONFIG (_config))); \ NMIP6Config * : (NM_IS_IP6_CONFIG (_config))); \
}) })
#else #else
#define _NM_IS_IP_CONFIG(typeexpr, config) NM_IS_IP_CONFIG(config, AF_UNSPEC) #define _NM_IS_IP_CONFIG(typeexpr, config) NM_IS_IP_CONFIG(config)
#endif #endif
#define NM_IP_CONFIG_CAST(config) \ #define NM_IP_CONFIG_CAST(config) \

4
src/nm-policy.c
View File

@@ -1975,8 +1975,8 @@ device_ip_config_changed (NMDevice *device,
int addr_family; int addr_family;
nm_assert (new_config || old_config); nm_assert (new_config || old_config);
nm_assert (!new_config || NM_IS_IP_CONFIG (new_config, AF_UNSPEC)); nm_assert (!new_config || NM_IS_IP_CONFIG (new_config));
nm_assert (!old_config || NM_IS_IP_CONFIG (old_config, AF_UNSPEC)); nm_assert (!old_config || NM_IS_IP_CONFIG (old_config));
if (new_config) { if (new_config) {
addr_family = nm_ip_config_get_addr_family (new_config); addr_family = nm_ip_config_get_addr_family (new_config);