jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

D-Bus: Remove useless wpa_s->conf checks

Browse source 
This cannot be NULL when an interface is in use. There is not much point
in couple of functions checking this while large number of other places
do not.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-01 02:10:37 +02:00
parent 88ce7938b0
commit 605325fb75
2 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -3345,14 +3345,6 @@ dbus_bool_t wpas_dbus_getter_networks(DBusMessageIter *iter, DBusError *error,
unsigned int i = 0, num = 0; unsigned int i = 0, num = 0;
dbus_bool_t success = FALSE; dbus_bool_t success = FALSE;
if (wpa_s->conf == NULL) {
wpa_printf(MSG_ERROR, "%s[dbus]: An error occurred getting "
"networks list.", __func__);
dbus_set_error(error, DBUS_ERROR_FAILED, "%s: an error "
"occurred getting the networks list", __func__);
return FALSE;
}
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
if (!network_is_persistent_group(ssid)) if (!network_is_persistent_group(ssid))
num++; num++;
@ -3407,16 +3399,6 @@ dbus_bool_t wpas_dbus_getter_pkcs11_engine_path(DBusMessageIter *iter,
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *pkcs11_engine_path; const char *pkcs11_engine_path;
if (wpa_s->conf == NULL) {
wpa_printf(MSG_ERROR,
"wpas_dbus_getter_pkcs11_engine_path[dbus]: An "
"error occurred getting the PKCS #11 engine path.");
dbus_set_error_const(
error, DBUS_ERROR_FAILED,
"An error occured getting the PKCS #11 engine path.");
return FALSE;
}
if (wpa_s->conf->pkcs11_engine_path == NULL) if (wpa_s->conf->pkcs11_engine_path == NULL)
pkcs11_engine_path = ""; pkcs11_engine_path = "";
else else
@ -3442,16 +3424,6 @@ dbus_bool_t wpas_dbus_getter_pkcs11_module_path(DBusMessageIter *iter,
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
const char *pkcs11_module_path; const char *pkcs11_module_path;
if (wpa_s->conf == NULL) {
wpa_printf(MSG_ERROR,
"wpas_dbus_getter_pkcs11_module_path[dbus]: An "
"error occurred getting the PKCS #11 module path.");
dbus_set_error_const(
error, DBUS_ERROR_FAILED,
"An error occured getting the PKCS #11 module path.");
return FALSE;
}
if (wpa_s->conf->pkcs11_module_path == NULL) if (wpa_s->conf->pkcs11_module_path == NULL)
pkcs11_module_path = ""; pkcs11_module_path = "";
else else

9
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -1695,15 +1695,6 @@ dbus_bool_t wpas_dbus_getter_persistent_groups(DBusMessageIter *iter,
unsigned int i = 0, num = 0; unsigned int i = 0, num = 0;
dbus_bool_t success = FALSE; dbus_bool_t success = FALSE;
if (wpa_s->conf == NULL) {
wpa_printf(MSG_ERROR, "dbus: %s: "
"An error occurred getting persistent groups list",
__func__);
dbus_set_error_const(error, DBUS_ERROR_FAILED, "an error "
"occurred getting persistent groups list");
return FALSE;
}
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
if (network_is_persistent_group(ssid)) if (network_is_persistent_group(ssid))
num++; num++;