Silenced compiler warnings on size_t printf format and shadowed variables

[libeap.git] / src / eap_peer / eap_gpsk.c

diff --git a/src/eap_peer/eap_gpsk.c b/src/eap_peer/eap_gpsk.c
index 963f41d..879dde6 100644 (file)
--- a/src/eap_peer/eap_gpsk.c
+++ b/src/eap_peer/eap_gpsk.c
@@ -238,8 +238,8 @@ const u8 * eap_gpsk_process_csuite_list(struct eap_sm *sm,
                return NULL;
        }
        if (*list_len == 0 || (*list_len % sizeof(struct eap_gpsk_csuite))) {
-               wpa_printf(MSG_DEBUG, "EAP-GPSK: Invalid CSuite_List len %d",
-                          *list_len);
+               wpa_printf(MSG_DEBUG, "EAP-GPSK: Invalid CSuite_List len %lu",
+                          (unsigned long) *list_len);
                return NULL;
        }
        *list = pos;
@@ -521,7 +521,9 @@ const u8 * eap_gpsk_validate_gpsk_3_mic(struct eap_gpsk_data *data,
        miclen = eap_gpsk_mic_len(data->vendor, data->specifier);
        if (end - pos < (int) miclen) {
                wpa_printf(MSG_DEBUG, "EAP-GPSK: Message too short for MIC "
-                          "(left=%d miclen=%d)", end - pos, miclen);
+                          "(left=%lu miclen=%lu)",
+                          (unsigned long) (end - pos),
+                          (unsigned long) miclen);
                return NULL;
        }
        if (eap_gpsk_compute_mic(data->sk, data->sk_len, data->vendor,
@@ -572,8 +574,9 @@ static struct wpabuf * eap_gpsk_process_gpsk_3(struct eap_sm *sm,
                return NULL;
        }
        if (pos != end) {
-               wpa_printf(MSG_DEBUG, "EAP-GPSK: Ignored %d bytes of extra "
-                          "data in the end of GPSK-2", end - pos);
+               wpa_printf(MSG_DEBUG, "EAP-GPSK: Ignored %lu bytes of extra "
+                          "data in the end of GPSK-2",
+                          (unsigned long) (end - pos));
        }
 
        resp = eap_gpsk_send_gpsk_4(data, eap_get_id(reqData));