[pkg-wpa-devel] r933 - /wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Dec 26 03:45:22 2007
New Revision: 933

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=933
Log:
make debian/patches/31_pcsc_funcs_printf_warnings.patch more portable

Modified:
    wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch

Modified: wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch?rev=933&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch (original)
+++ wpasupplicant/trunk/debian/patches/31_pcsc_funcs_printf_warnings.patch Wed Dec 26 03:45:22 2007
@@ -1,81 +1,94 @@
 --- a/src/utils/pcsc_funcs.c
 +++ b/src/utils/pcsc_funcs.c
-@@ -848,7 +848,7 @@
+@@ -848,7 +848,8 @@
  	}
  	if (blen != len + 2) {
  		wpa_printf(MSG_DEBUG, "SCARD: record read returned unexpected "
 -			   "length %d (expected %d)", blen, len + 2);
-+			   "length %zd (expected %zd)", blen, len + 2);
++			   "length %ld (expected %ld)",
++			   (unsigned long) blen, (unsigned long) len + 2);
  		os_free(buf);
  		return -3;
  	}
-@@ -891,7 +891,7 @@
+@@ -891,7 +892,8 @@
  	}
  	if (blen != len + 2) {
  		wpa_printf(MSG_DEBUG, "SCARD: file read returned unexpected "
 -			   "length %d (expected %d)", blen, len + 2);
-+			   "length %zd (expected %zd)", blen, len + 2);
++			   "length %ld (expected %ld)",
++			   (unsigned long) blen, (unsigned long) len + 2);
  		os_free(buf);
  		return -3;
  	}
-@@ -969,7 +969,7 @@
+@@ -969,7 +971,7 @@
  		return -1;
  	if (blen < 4) {
  		wpa_printf(MSG_WARNING, "SCARD: too short (GSM) EF-IMSI "
 -			   "header (len=%d)", blen);
-+			   "header (len=%zd)", blen);
++			   "header (len=%ld)", (unsigned long) blen);
  		return -2;
  	}
  
-@@ -982,13 +982,13 @@
+@@ -982,14 +984,14 @@
  		blen = file_size;
  	}
  	if (blen < 2 || blen > sizeof(buf)) {
 -		wpa_printf(MSG_DEBUG, "SCARD: invalid IMSI file length=%d",
-+		wpa_printf(MSG_DEBUG, "SCARD: invalid IMSI file length=%zd",
- 			   blen);
+-			   blen);
++		wpa_printf(MSG_DEBUG, "SCARD: invalid IMSI file length=%ld",
++			   (unsigned long) blen);
  		return -3;
  	}
  
  	imsilen = (blen - 2) * 2 + 1;
 -	wpa_printf(MSG_DEBUG, "SCARD: IMSI file length=%d imsilen=%d",
-+	wpa_printf(MSG_DEBUG, "SCARD: IMSI file length=%zd imsilen=%zd",
- 		   blen, imsilen);
+-		   blen, imsilen);
++	wpa_printf(MSG_DEBUG, "SCARD: IMSI file length=%ld imsilen=%ld",
++		   (unsigned long) blen, (unsigned long) imsilen);
  	if (blen < 2 || imsilen > *len) {
  		*len = imsilen;
-@@ -1071,7 +1071,7 @@
+ 		return -4;
+@@ -1071,8 +1073,8 @@
  	    (scard->sim_type == SCARD_USIM &&
  	     (len != 2 || resp[0] != 0x61 || resp[1] != 0x0e))) {
  		wpa_printf(MSG_WARNING, "SCARD: unexpected response for GSM "
 -			   "auth request (len=%d resp=%02x %02x)",
-+			   "auth request (len=%zd resp=%02x %02x)",
- 			   len, resp[0], resp[1]);
+-			   len, resp[0], resp[1]);
++			   "auth request (len=%ld resp=%02x %02x)",
++			   (unsigned long) len, resp[0], resp[1]);
  		return -3;
  	}
-@@ -1085,7 +1085,7 @@
+ 	get_resp[4] = resp[1];
+@@ -1085,8 +1087,8 @@
  	if (scard->sim_type == SCARD_GSM_SIM) {
  		if (len != 4 + 8 + 2) {
  			wpa_printf(MSG_WARNING, "SCARD: unexpected data "
 -				   "length for GSM auth (len=%d, expected 14)",
-+				   "length for GSM auth (len=%zd, expected 14)",
- 				   len);
+-				   len);
++				   "length for GSM auth (len=%ld, expected 14)",
++				   (unsigned long) len);
  			return -5;
  		}
-@@ -1094,7 +1094,7 @@
+ 		os_memcpy(sres, buf, 4);
+@@ -1094,8 +1096,8 @@
  	} else {
  		if (len != 1 + 4 + 1 + 8 + 2) {
  			wpa_printf(MSG_WARNING, "SCARD: unexpected data "
 -				   "length for USIM auth (len=%d, "
-+				   "length for USIM auth (len=%zd, "
- 				   "expected 16)", len);
+-				   "expected 16)", len);
++				   "length for USIM auth (len=%ld, "
++				   "expected 16)", (unsigned long) len);
  			return -5;
  		}
-@@ -1176,7 +1176,7 @@
+ 		if (buf[0] != 4 || buf[5] != 8) {
+@@ -1176,8 +1178,8 @@
  		return -1;
  	} else if (len != 2 || resp[0] != 0x61) {
  		wpa_printf(MSG_WARNING, "SCARD: unexpected response for UMTS "
 -			   "auth request (len=%d resp=%02x %02x)",
-+			   "auth request (len=%zd resp=%02x %02x)",
- 			   len, resp[0], resp[1]);
+-			   len, resp[0], resp[1]);
++			   "auth request (len=%ld resp=%02x %02x)",
++			   (unsigned long) len, resp[0], resp[1]);
  		return -1;
  	}
+ 	get_resp[4] = resp[1];