fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-25 23:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: cleanup allocation of NMDnsConfigData and NMDnsIPConfigData

Browse source 
(cherry picked from commit 190eeb5e9f)
(cherry picked from commit 795eca6e1b)
This commit is contained in:
Thomas Haller 2020-11-19 15:13:53 +01:00
parent e1424f264d
commit 0250f85b71
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/dns/nm-dns-manager.c
View file

@ -231,10 +231,12 @@ _ip_config_data_new (NMDnsConfigData *data,
nm_assert (NM_IS_IP_CONFIG (ip_config, AF_UNSPEC));
nm_assert (ip_config_type != NM_DNS_IP_CONFIG_TYPE_REMOVED);
ip_data = g_slice_new0 (NMDnsIPConfigData);
ip_data->data = data;
ip_data->ip_config = g_object_ref (ip_config);
ip_data->ip_config_type = ip_config_type;
ip_data = g_slice_new (NMDnsIPConfigData);
*ip_data = (NMDnsIPConfigData) {
.data = data,
.ip_config = g_object_ref (ip_config),
.ip_config_type = ip_config_type,
};
c_list_link_tail (&data->data_lst_head, &ip_data->data_lst);
c_list_link_tail (&NM_DNS_MANAGER_GET_PRIVATE (data->self)->ip_config_lst_head, &ip_data->ip_config_lst);
@ -264,7 +266,7 @@ _ip_config_data_free (NMDnsIPConfigData *ip_data)
ip_data);
g_object_unref (ip_data->ip_config);
g_slice_free (NMDnsIPConfigData, ip_data);
nm_g_slice_free (ip_data);
}
static NMDnsIPConfigData *
@ -290,7 +292,7 @@ _config_data_free (NMDnsConfigData *data)
_ASSERT_config_data (data);
nm_assert (c_list_is_empty (&data->data_lst_head));
g_slice_free (NMDnsConfigData, data);
nm_g_slice_free (data);
}
static int
@ -1696,10 +1698,12 @@ nm_dns_manager_set_ip_config (NMDnsManager *self,
}
if (!data) {
data = g_slice_new0 (NMDnsConfigData);
data->ifindex = ifindex;
data->self = self;
c_list_init (&data->data_lst_head);
data = g_slice_new (NMDnsConfigData);
*data = (NMDnsConfigData) {
.ifindex = ifindex,
.self = self,
.data_lst_head = C_LIST_INIT (data->data_lst_head),
};
_ASSERT_config_data (data);
g_hash_table_insert (priv->configs, GINT_TO_POINTER (ifindex), data);
}