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

Use unsigned/signed printf format more consistently

Browse source 
These configuration parameters did not use matching printf format string
parameters (signed vs. unsigned). While these configuratin values are,
in practice, small unsigned integers, the implementation should use
matching types to write these.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-06-23 19:11:35 +03:00
parent 59bae7463a
commit 91b7a5e146
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
wpa_supplicant/config_file.c
View file

@ -1016,13 +1016,13 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
if (config->driver_param) if (config->driver_param)
fprintf(f, "driver_param=%s\n", config->driver_param); fprintf(f, "driver_param=%s\n", config->driver_param);
if (config->dot11RSNAConfigPMKLifetime) if (config->dot11RSNAConfigPMKLifetime)
fprintf(f, "dot11RSNAConfigPMKLifetime=%d\n", fprintf(f, "dot11RSNAConfigPMKLifetime=%u\n",
config->dot11RSNAConfigPMKLifetime); config->dot11RSNAConfigPMKLifetime);
if (config->dot11RSNAConfigPMKReauthThreshold) if (config->dot11RSNAConfigPMKReauthThreshold)
fprintf(f, "dot11RSNAConfigPMKReauthThreshold=%d\n", fprintf(f, "dot11RSNAConfigPMKReauthThreshold=%u\n",
config->dot11RSNAConfigPMKReauthThreshold); config->dot11RSNAConfigPMKReauthThreshold);
if (config->dot11RSNAConfigSATimeout) if (config->dot11RSNAConfigSATimeout)
fprintf(f, "dot11RSNAConfigSATimeout=%d\n", fprintf(f, "dot11RSNAConfigSATimeout=%u\n",
config->dot11RSNAConfigSATimeout); config->dot11RSNAConfigSATimeout);
if (config->update_config) if (config->update_config)
fprintf(f, "update_config=%d\n", config->update_config); fprintf(f, "update_config=%d\n", config->update_config);
@ -1070,27 +1070,27 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
#endif /* CONFIG_WPS */ #endif /* CONFIG_WPS */
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if (config->p2p_listen_reg_class) if (config->p2p_listen_reg_class)
fprintf(f, "p2p_listen_reg_class=%u\n", fprintf(f, "p2p_listen_reg_class=%d\n",
config->p2p_listen_reg_class); config->p2p_listen_reg_class);
if (config->p2p_listen_channel) if (config->p2p_listen_channel)
fprintf(f, "p2p_listen_channel=%u\n", fprintf(f, "p2p_listen_channel=%d\n",
config->p2p_listen_channel); config->p2p_listen_channel);
if (config->p2p_oper_reg_class) if (config->p2p_oper_reg_class)
fprintf(f, "p2p_oper_reg_class=%u\n", fprintf(f, "p2p_oper_reg_class=%d\n",
config->p2p_oper_reg_class); config->p2p_oper_reg_class);
if (config->p2p_oper_channel) if (config->p2p_oper_channel)
fprintf(f, "p2p_oper_channel=%u\n", config->p2p_oper_channel); fprintf(f, "p2p_oper_channel=%d\n", config->p2p_oper_channel);
if (config->p2p_go_intent != DEFAULT_P2P_GO_INTENT) if (config->p2p_go_intent != DEFAULT_P2P_GO_INTENT)
fprintf(f, "p2p_go_intent=%u\n", config->p2p_go_intent); fprintf(f, "p2p_go_intent=%d\n", config->p2p_go_intent);
if (config->p2p_ssid_postfix) if (config->p2p_ssid_postfix)
fprintf(f, "p2p_ssid_postfix=%s\n", config->p2p_ssid_postfix); fprintf(f, "p2p_ssid_postfix=%s\n", config->p2p_ssid_postfix);
if (config->persistent_reconnect) if (config->persistent_reconnect)
fprintf(f, "persistent_reconnect=%u\n", fprintf(f, "persistent_reconnect=%d\n",
config->persistent_reconnect); config->persistent_reconnect);
if (config->p2p_intra_bss != DEFAULT_P2P_INTRA_BSS) if (config->p2p_intra_bss != DEFAULT_P2P_INTRA_BSS)
fprintf(f, "p2p_intra_bss=%u\n", config->p2p_intra_bss); fprintf(f, "p2p_intra_bss=%d\n", config->p2p_intra_bss);
if (config->p2p_group_idle) if (config->p2p_group_idle)
fprintf(f, "p2p_group_idle=%u\n", config->p2p_group_idle); fprintf(f, "p2p_group_idle=%d\n", config->p2p_group_idle);
if (config->p2p_passphrase_len) if (config->p2p_passphrase_len)
fprintf(f, "p2p_passphrase_len=%u\n", fprintf(f, "p2p_passphrase_len=%u\n",
config->p2p_passphrase_len); config->p2p_passphrase_len);
@ -1118,22 +1118,21 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
fprintf(f, "p2p_optimize_listen_chan=%d\n", fprintf(f, "p2p_optimize_listen_chan=%d\n",
config->p2p_optimize_listen_chan); config->p2p_optimize_listen_chan);
if (config->p2p_go_ht40) if (config->p2p_go_ht40)
fprintf(f, "p2p_go_ht40=%u\n", config->p2p_go_ht40); fprintf(f, "p2p_go_ht40=%d\n", config->p2p_go_ht40);
if (config->p2p_go_vht) if (config->p2p_go_vht)
fprintf(f, "p2p_go_vht=%u\n", config->p2p_go_vht); fprintf(f, "p2p_go_vht=%d\n", config->p2p_go_vht);
if (config->p2p_go_ctwindow != DEFAULT_P2P_GO_CTWINDOW) if (config->p2p_go_ctwindow != DEFAULT_P2P_GO_CTWINDOW)
fprintf(f, "p2p_go_ctwindow=%u\n", config->p2p_go_ctwindow); fprintf(f, "p2p_go_ctwindow=%d\n", config->p2p_go_ctwindow);
if (config->p2p_disabled) if (config->p2p_disabled)
fprintf(f, "p2p_disabled=%u\n", config->p2p_disabled); fprintf(f, "p2p_disabled=%d\n", config->p2p_disabled);
if (config->p2p_no_group_iface) if (config->p2p_no_group_iface)
fprintf(f, "p2p_no_group_iface=%u\n", fprintf(f, "p2p_no_group_iface=%d\n",
config->p2p_no_group_iface); config->p2p_no_group_iface);
if (config->p2p_ignore_shared_freq) if (config->p2p_ignore_shared_freq)
fprintf(f, "p2p_ignore_shared_freq=%u\n", fprintf(f, "p2p_ignore_shared_freq=%d\n",
config->p2p_ignore_shared_freq); config->p2p_ignore_shared_freq);
if (config->p2p_cli_probe) if (config->p2p_cli_probe)
fprintf(f, "p2p_cli_probe=%u\n", fprintf(f, "p2p_cli_probe=%d\n", config->p2p_cli_probe);
config->p2p_cli_probe);
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
if (config->country[0] && config->country[1]) { if (config->country[0] && config->country[1]) {
fprintf(f, "country=%c%c\n", fprintf(f, "country=%c%c\n",
@ -1153,14 +1152,14 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
if (config->max_num_sta != DEFAULT_MAX_NUM_STA) if (config->max_num_sta != DEFAULT_MAX_NUM_STA)
fprintf(f, "max_num_sta=%u\n", config->max_num_sta); fprintf(f, "max_num_sta=%u\n", config->max_num_sta);
if (config->disassoc_low_ack) if (config->disassoc_low_ack)
fprintf(f, "disassoc_low_ack=%u\n", config->disassoc_low_ack); fprintf(f, "disassoc_low_ack=%d\n", config->disassoc_low_ack);
#ifdef CONFIG_HS20 #ifdef CONFIG_HS20
if (config->hs20) if (config->hs20)
fprintf(f, "hs20=1\n"); fprintf(f, "hs20=1\n");
#endif /* CONFIG_HS20 */ #endif /* CONFIG_HS20 */
#ifdef CONFIG_INTERWORKING #ifdef CONFIG_INTERWORKING
if (config->interworking) if (config->interworking)
fprintf(f, "interworking=%u\n", config->interworking); fprintf(f, "interworking=%d\n", config->interworking);
if (!is_zero_ether_addr(config->hessid)) if (!is_zero_ether_addr(config->hessid))
fprintf(f, "hessid=" MACSTR "\n", MAC2STR(config->hessid)); fprintf(f, "hessid=" MACSTR "\n", MAC2STR(config->hessid));
if (config->access_network_type != DEFAULT_ACCESS_NETWORK_TYPE) if (config->access_network_type != DEFAULT_ACCESS_NETWORK_TYPE)
@ -1168,7 +1167,7 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
config->access_network_type); config->access_network_type);
#endif /* CONFIG_INTERWORKING */ #endif /* CONFIG_INTERWORKING */
if (config->pbc_in_m1) if (config->pbc_in_m1)
fprintf(f, "pbc_in_m1=%u\n", config->pbc_in_m1); fprintf(f, "pbc_in_m1=%d\n", config->pbc_in_m1);
if (config->wps_nfc_pw_from_config) { if (config->wps_nfc_pw_from_config) {
if (config->wps_nfc_dev_pw_id) if (config->wps_nfc_dev_pw_id)
fprintf(f, "wps_nfc_dev_pw_id=%d\n", fprintf(f, "wps_nfc_dev_pw_id=%d\n",
@ -1227,7 +1226,7 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
int i; int i;
fprintf(f, "freq_list="); fprintf(f, "freq_list=");
for (i = 0; config->freq_list[i]; i++) { for (i = 0; config->freq_list[i]; i++) {
fprintf(f, "%s%u", i > 0 ? " " : "", fprintf(f, "%s%d", i > 0 ? " " : "",
config->freq_list[i]); config->freq_list[i]);
} }
fprintf(f, "\n"); fprintf(f, "\n");
@ -1268,7 +1267,7 @@ static void wpa_config_write_global(FILE *f, struct wpa_config *config)
fprintf(f, "preassoc_mac_addr=%d\n", config->preassoc_mac_addr); fprintf(f, "preassoc_mac_addr=%d\n", config->preassoc_mac_addr);
if (config->key_mgmt_offload != DEFAULT_KEY_MGMT_OFFLOAD) if (config->key_mgmt_offload != DEFAULT_KEY_MGMT_OFFLOAD)
fprintf(f, "key_mgmt_offload=%u\n", config->key_mgmt_offload); fprintf(f, "key_mgmt_offload=%d\n", config->key_mgmt_offload);
if (config->user_mpm != DEFAULT_USER_MPM) if (config->user_mpm != DEFAULT_USER_MPM)
fprintf(f, "user_mpm=%d\n", config->user_mpm); fprintf(f, "user_mpm=%d\n", config->user_mpm);