From 199754a845594430364d579b1bcc5dee2f33db5b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 4 Aug 2015 10:49:54 +0200 Subject: [PATCH] dispatcher: remove local @iface variable from handle_action() --- callouts/nm-dispatcher.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index cab2ba1098..c769a8042d 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -622,7 +622,6 @@ handle_action (NMDBusDispatcher *dbus_dispatcher, GSList *iter; Request *request; char **p; - char *iface = NULL; guint i, num_nowait = 0; sorted_scripts = find_scripts (str_action); @@ -652,18 +651,16 @@ handle_action (NMDBusDispatcher *dbus_dispatcher, vpn_ip_iface, vpn_ip4_props, vpn_ip6_props, - &iface); + &request->iface); if (request->debug) { g_message ("------------ Action ID %p '%s' Interface %s Environment ------------", - context, str_action, iface ? iface : "(none)"); + context, str_action, request->iface ? request->iface : "(none)"); for (p = request->envp; *p; p++) g_message (" %s", *p); g_message ("\n"); } - request->iface = iface; - request->scripts = g_ptr_array_new_full (5, script_info_free); for (iter = sorted_scripts; iter; iter = g_slist_next (iter)) { ScriptInfo *s;