From: Jouni Malinen <j@w1.fi>
Date: Sun, 13 Nov 2011 18:54:44 +0000 (+0200)
Subject: dbus: Remove unused default string for bridge_ifname
X-Git-Tag: aosp-jb-start~348
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c660b0c25794a91f41b11c8f7cf97afabde3ae08;p=thirdparty%2Fhostap.git

dbus: Remove unused default string for bridge_ifname

wpa_s->bridge_ifname is an array and cannot be NULL.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 634efcb8f..9b88820c1 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2490,9 +2490,7 @@ dbus_bool_t wpas_dbus_getter_bridge_ifname(DBusMessageIter *iter,
 					   void *user_data)
 {
 	struct wpa_supplicant *wpa_s = user_data;
-	const char *bridge_ifname;
-
-	bridge_ifname = wpa_s->bridge_ifname ? wpa_s->bridge_ifname : "";
+	const char *bridge_ifname = wpa_s->bridge_ifname;
 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
 						&bridge_ifname, error);
 }