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

D-Bus: Avoid compiler warning on sometimes uninitialized variable

Browse source 
The logic in wpas_dbus_signal_p2p_provision_discovery() seemed to imply
that there could be a case where _signal would be used uninitized. While
that is not the case since either (request || !status) or (!request &&
status) would always be true, some compilers do not seem to be clever
enough to figure that out to avoid the warning. Make this easier for
such compilers by removing the (!request && status) condition since it
is identical to !(request || !status).

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-31 16:33:35 +02:00
parent bc7baaff24
commit 19d4dab759
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wpa_supplicant/dbus/dbus_new.c
View file

@ -1056,9 +1056,10 @@ void wpas_dbus_signal_p2p_provision_discovery(struct wpa_supplicant *wpa_s,
"ProvisionDiscoveryPBCResponse"; "ProvisionDiscoveryPBCResponse";
else else
return; /* Unknown or un-supported method */ return; /* Unknown or un-supported method */
} else if (!request && status) } else {
/* Explicit check for failure response */ /* Explicit check for failure response */
_signal = "ProvisionDiscoveryFailure"; _signal = "ProvisionDiscoveryFailure";
}
add_pin = ((request && (config_methods & WPS_CONFIG_DISPLAY)) || add_pin = ((request && (config_methods & WPS_CONFIG_DISPLAY)) ||
(!request && !status && (!request && !status &&