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

core: use gs_free_slist in NMManager

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-07-15 20:10:06 +02:00
parent 51bd942575
commit 37f08bc848
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nm-manager.c
View File

@@ -1537,17 +1537,6 @@ done:
g_clear_error (&error); g_clear_error (&error);
} }
/* This should really be moved to gsystem. */
#define free_slist __attribute__ ((cleanup(local_slist_free)))
static void
local_slist_free (void *loc)
{
GSList **location = loc;
if (location)
g_slist_free (*location);
}
static gboolean static gboolean
match_connection_filter (NMConnection *connection, gpointer user_data) match_connection_filter (NMConnection *connection, gpointer user_data)
{ {
@@ -1566,7 +1555,7 @@ static NMConnection *
get_existing_connection (NMManager *manager, NMDevice *device) get_existing_connection (NMManager *manager, NMDevice *device)
{ {
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
free_slist GSList *connections = nm_manager_get_activatable_connections (manager); gs_free_slist GSList *connections = nm_manager_get_activatable_connections (manager);
NMConnection *connection = NULL, *matched; NMConnection *connection = NULL, *matched;
NMSettingsConnection *added = NULL; NMSettingsConnection *added = NULL;
GError *error = NULL; GError *error = NULL;