diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-03-23 11:00:43 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-03-23 11:05:34 +0100 |
| commit | 073994ca4284a5e99314195981aa254f06c3bf69 (patch) | |
| tree | 7d935de27616ff67fbedb141e2ee3152282dbfe2 /src/platform | |
| parent | c50b4621d4415f9156e969a6a05fb37e1bb02e18 (diff) | |
| download | NetworkManager-073994ca4284a5e99314195981aa254f06c3bf69.tar.gz | |
all: use nm_clear_g_free() instead of g_clear_pointer()
I think it's preferable to use nm_clear_g_free() instead of
g_clear_pointer(, g_free). The reasons are not very strong,
but I think it is overall preferable to have a shorthand for this
frequently used functionality.
sed 's/\<g_clear_pointer *(\([^;]*\), *\(g_free\) *)/nm_clear_g_free (\1)/g' $(git grep -l g_clear_pointer) -i
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/nm-fake-platform.c | 2 | ||||
| -rw-r--r-- | src/platform/nmp-object.c | 4 | ||||
| -rw-r--r-- | src/platform/wifi/nm-wifi-utils-nl80211.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 8986d4d835..5eeeea2cbe 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -420,7 +420,7 @@ link_delete (NMPlatform *platform, int ifindex) return FALSE; obj_old = g_steal_pointer (&device->obj); - g_clear_pointer (&device->udi, g_free); + nm_clear_g_free (&device->udi); cache_op = nmp_cache_remove (nm_platform_get_cache (platform), obj_old, diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 309192c3a8..541211cdc1 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -525,11 +525,11 @@ _vlan_xgress_qos_mappings_cpy (guint *dst_n_map, const NMVlanQosMapping *src_map) { if (src_n_map == 0) { - g_clear_pointer (dst_map, g_free); + nm_clear_g_free (dst_map); *dst_n_map = 0; } else if ( src_n_map != *dst_n_map || _vlan_xgress_qos_mappings_cmp (src_n_map, *dst_map, src_map) != 0) { - g_clear_pointer (dst_map, g_free); + nm_clear_g_free (dst_map); *dst_n_map = src_n_map; if (src_n_map > 0) *dst_map = nm_memdup (src_map, sizeof (*src_map) * src_n_map); diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c index afeb3b02cd..a090ef9e22 100644 --- a/src/platform/wifi/nm-wifi-utils-nl80211.c +++ b/src/platform/wifi/nm-wifi-utils-nl80211.c @@ -152,7 +152,7 @@ dispose (GObject *object) { NMWifiUtilsNl80211 *self = NM_WIFI_UTILS_NL80211 (object); - g_clear_pointer (&self->freqs, g_free); + nm_clear_g_free (&self->freqs); } struct nl80211_iface_info { |