From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 11 Apr 2017 16:55:33 +0000 (+0200)
Subject: fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c)
X-Git-Tag: v3.0.0~11^2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/31a29271b97c9780e1708a13589f31d418a88284

fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c)
---

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 786d0da1..e73f5834 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -86,7 +86,7 @@ int CmdHFEPAPACEReplay(const char *Cmd)
 	uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
 
 	// usage message
-	static const char const *usage_msg =
+	static const char *usage_msg =
 		"Please specify 5 APDUs separated by spaces. "
 		"Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";
 
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index bf0f5dcf..39ff1804 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -337,7 +337,7 @@ static void topaz_print_control_TLVs(uint8_t *memory)
 		if (TLV_type == 0x02) {			// a Reserved Memory Control TLV
 			uint8_t pages_addr = TLV_value[0] >> 4;
 			uint8_t byte_offset = TLV_value[0] & 0x0f;
-			uint8_t size_in_bytes = TLV_value[1] ? TLV_value[1] : 256;
+			uint16_t size_in_bytes = TLV_value[1] ? TLV_value[1] : 256;
 			uint8_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
 			uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
 			PrintAndLog("Reserved Memory of %d bytes at byte offset 0x%02x.", 
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 4904dfda..e4a8e8f9 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -139,7 +139,7 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) {
 	bmp_t accu = BMP_C(0);
 	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
 	unsigned long iter = 0UL, idx;
-	int cmask = ~(~0 << CHAR_BIT), c;
+	int cmask = ~(~0U << CHAR_BIT), c;
 	int count = 0, ofs;
 	poly_t poly = PZERO;
 	if(bperhx == 0) return(poly);
@@ -204,7 +204,7 @@ strtop(const char *string, int flags, int bperhx) {
 	bmp_t accu;
 	bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
 	int pass, count, ofs;
-	int cmask = ~(~0 << CHAR_BIT), c;
+	int cmask = ~(~0U << CHAR_BIT), c;
 	const char *s;
 
 	poly_t poly = PZERO;
diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 9187460b..9398a1f3 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -99,7 +99,7 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
 /** binsearch
  * Binary search for the first occurence of *stop's MSB in sorted [start,stop]
  */
-static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
+/* static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
 {
 	uint32_t mid, val = *stop & 0xff000000;
 	while(start != stop)
@@ -110,7 +110,7 @@ static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
 
 	return start;
 }
-
+ */
 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */
diff --git a/zlib/inflate.c b/zlib/inflate.c
index 091b9a22..df2f9d66 100644
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -1523,7 +1523,7 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    if (strm == Z_NULL || strm->state == Z_NULL) return ~0UL << 16;
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
         (state->mode == COPY ? state->length :