From 06df2aa60abb7b602699144123e3639e03ef1a96 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 26 Apr 2014 11:09:29 +0300 Subject: [PATCH] Remove floating constant suffix 'd' from test coee clang scan-build does not seem to like the 'd' suffix on floating constants and ends up reporting analyzer failures. Since this suffix does not seem to be needed, get rid of it to clear such warnings. Signed-off-by: Jouni Malinen --- hostapd/config_file.c | 4 ++-- src/ap/ap_config.c | 10 +++++----- src/ap/beacon.c | 2 +- src/ap/ieee802_11.c | 6 +++--- src/ap/wpa_auth.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hostapd/config_file.c b/hostapd/config_file.c index c65d384a7..caf51a94a 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -3075,8 +3075,8 @@ static int hostapd_config_fill(struct hostapd_config *conf, char *end; \ \ conf->_val = strtod(pos, &end); \ - if (*end || conf->_val < 0.0d || \ - conf->_val > 1.0d) { \ + if (*end || conf->_val < 0.0 || \ + conf->_val > 1.0) { \ wpa_printf(MSG_ERROR, \ "Line %d: Invalid value '%s'", \ line, pos); \ diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c index 0a143d394..9680817b5 100644 --- a/src/ap/ap_config.c +++ b/src/ap/ap_config.c @@ -174,11 +174,11 @@ struct hostapd_config * hostapd_config_defaults(void) conf->ap_table_expiration_time = 60; #ifdef CONFIG_TESTING_OPTIONS - conf->ignore_probe_probability = 0.0d; - conf->ignore_auth_probability = 0.0d; - conf->ignore_assoc_probability = 0.0d; - conf->ignore_reassoc_probability = 0.0d; - conf->corrupt_gtk_rekey_mic_probability = 0.0d; + conf->ignore_probe_probability = 0.0; + conf->ignore_auth_probability = 0.0; + conf->ignore_assoc_probability = 0.0; + conf->ignore_reassoc_probability = 0.0; + conf->corrupt_gtk_rekey_mic_probability = 0.0; #endif /* CONFIG_TESTING_OPTIONS */ #ifdef CONFIG_ACS diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 38600e6ff..27525dc62 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -645,7 +645,7 @@ void handle_probe_req(struct hostapd_data *hapd, * with AP configuration */ #ifdef CONFIG_TESTING_OPTIONS - if (hapd->iconf->ignore_probe_probability > 0.0d && + if (hapd->iconf->ignore_probe_probability > 0.0 && drand48() < hapd->iconf->ignore_probe_probability) { wpa_printf(MSG_INFO, "TESTING: ignoring probe request from " MACSTR, diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 0430c701d..dbe63210f 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -565,7 +565,7 @@ static void handle_auth(struct hostapd_data *hapd, } #ifdef CONFIG_TESTING_OPTIONS - if (hapd->iconf->ignore_auth_probability > 0.0d && + if (hapd->iconf->ignore_auth_probability > 0.0 && drand48() < hapd->iconf->ignore_auth_probability) { wpa_printf(MSG_INFO, "TESTING: ignoring auth frame from " MACSTR, @@ -1291,7 +1291,7 @@ static void handle_assoc(struct hostapd_data *hapd, #ifdef CONFIG_TESTING_OPTIONS if (reassoc) { - if (hapd->iconf->ignore_reassoc_probability > 0.0d && + if (hapd->iconf->ignore_reassoc_probability > 0.0 && drand48() < hapd->iconf->ignore_reassoc_probability) { wpa_printf(MSG_INFO, "TESTING: ignoring reassoc request from " @@ -1299,7 +1299,7 @@ static void handle_assoc(struct hostapd_data *hapd, return; } } else { - if (hapd->iconf->ignore_assoc_probability > 0.0d && + if (hapd->iconf->ignore_assoc_probability > 0.0 && drand48() < hapd->iconf->ignore_assoc_probability) { wpa_printf(MSG_INFO, "TESTING: ignoring assoc request from " diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c index 77e785848..d2126103d 100644 --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c @@ -1421,7 +1421,7 @@ void __wpa_send_eapol(struct wpa_authenticator *wpa_auth, key->key_mic); #ifdef CONFIG_TESTING_OPTIONS if (!pairwise && - wpa_auth->conf.corrupt_gtk_rekey_mic_probability > 0.0d && + wpa_auth->conf.corrupt_gtk_rekey_mic_probability > 0.0 && drand48() < wpa_auth->conf.corrupt_gtk_rekey_mic_probability) { wpa_auth_logger(wpa_auth, sm->addr, LOGGER_INFO,