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

all: avoid useless cast of g_free() to GDestroyNotify

Browse Source
This commit is contained in:
Thomas Haller
2018-08-12 16:53:18 +02:00
parent dc316c8afe
commit dba19ebd7d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm-core/nm-utils.c
View File

@@ -5654,7 +5654,7 @@ _nm_utils_team_config_get (const char *conf,
g_ptr_array_free (data, TRUE); g_ptr_array_free (data, TRUE);
} else if (json_is_array (json_element)) { } else if (json_is_array (json_element)) {
GPtrArray *data = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free); GPtrArray *data = g_ptr_array_new_with_free_func (g_free);
json_t *str_element; json_t *str_element;
int index; int index;

4
libnm-core/tests/test-setting.c
View File

@@ -1002,7 +1002,7 @@ test_runner_loadbalance_sync_from_config (void)
{ {
gs_unref_ptrarray GPtrArray *tx_hash = NULL; gs_unref_ptrarray GPtrArray *tx_hash = NULL;
tx_hash = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free); tx_hash = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (tx_hash, g_strdup ("eth")); g_ptr_array_add (tx_hash, g_strdup ("eth"));
g_ptr_array_add (tx_hash, g_strdup ("ipv4")); g_ptr_array_add (tx_hash, g_strdup ("ipv4"));
g_ptr_array_add (tx_hash, g_strdup ("ipv6")); g_ptr_array_add (tx_hash, g_strdup ("ipv6"));
@@ -1039,7 +1039,7 @@ test_runner_lacp_sync_from_config (void)
{ {
gs_unref_ptrarray GPtrArray *tx_hash = NULL; gs_unref_ptrarray GPtrArray *tx_hash = NULL;
tx_hash = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free); tx_hash = g_ptr_array_new_with_free_func (g_free);
g_ptr_array_add (tx_hash, g_strdup ("eth")); g_ptr_array_add (tx_hash, g_strdup ("eth"));
g_ptr_array_add (tx_hash, g_strdup ("ipv4")); g_ptr_array_add (tx_hash, g_strdup ("ipv4"));
g_ptr_array_add (tx_hash, g_strdup ("ipv6")); g_ptr_array_add (tx_hash, g_strdup ("ipv6"));

2
libnm-util/nm-setting.c
View File

@@ -321,7 +321,7 @@ nm_setting_to_hash (NMSetting *setting, NMSettingHashFlags flags)
property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs); property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs);
hash = g_hash_table_new_full (g_str_hash, g_str_equal, hash = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free, destroy_gvalue); g_free, destroy_gvalue);
for (i = 0; i < n_property_specs; i++) { for (i = 0; i < n_property_specs; i++) {
GParamSpec *prop_spec = property_specs[i]; GParamSpec *prop_spec = property_specs[i];

2
libnm-util/nm-utils.c
View File

@@ -491,7 +491,7 @@ nm_utils_gvalue_hash_dup (GHashTable *hash)
g_return_val_if_fail (hash != NULL, NULL); g_return_val_if_fail (hash != NULL, NULL);
table = g_hash_table_new_full (g_str_hash, g_str_equal, table = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free, g_free,
value_destroy); value_destroy);
g_hash_table_foreach (hash, value_dup, table); g_hash_table_foreach (hash, value_dup, table);

4
src/supplicant/nm-supplicant-config.c
View File

@@ -94,11 +94,11 @@ nm_supplicant_config_init (NMSupplicantConfig * self)
NMSupplicantConfigPrivate *priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self); NMSupplicantConfigPrivate *priv = NM_SUPPLICANT_CONFIG_GET_PRIVATE (self);
priv->config = g_hash_table_new_full (nm_str_hash, g_str_equal, priv->config = g_hash_table_new_full (nm_str_hash, g_str_equal,
(GDestroyNotify) g_free, g_free,
(GDestroyNotify) config_option_free); (GDestroyNotify) config_option_free);
priv->blobs = g_hash_table_new_full (nm_str_hash, g_str_equal, priv->blobs = g_hash_table_new_full (nm_str_hash, g_str_equal,
(GDestroyNotify) g_free, g_free,
(GDestroyNotify) g_bytes_unref); (GDestroyNotify) g_bytes_unref);
priv->ap_scan = 1; priv->ap_scan = 1;