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

diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 786d0da1831a89e2bed31185ede8768955ae0c1e..e73f58340549bf3ff9ea933ae6046d747904b798 100644 (file)
--- 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
        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";
 
                "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 bf0f5dcfed6ba762b93659294655eeed7967d303..39ff180473d19fa1eee81329cfd6e52ae960ac7f 100644 (file)
--- 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;
                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.", 
                        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 4904dfda30ed61ab05938a197241625d6202c1db..e4a8e8f950f307c2c4a52f2d38cdcccac68b9da3 100644 (file)
--- 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;
        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);
        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;
        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;
        const char *s;
 
        poly_t poly = PZERO;

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 9187460bb5198c82136683e28f3cf81bd9ef3fe0..9398a1f34938638886f846d2956402da7dc5f291 100644 (file)
--- 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]
  */
 /** 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)
 {
        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;
 }
 
        return start;
 }

-
+ */

 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */
 /** update_contribution
  * helper, calculates the partial linear feedback contributions and puts in MSB
  */

diff --git a/zlib/inflate.c b/zlib/inflate.c
index 091b9a22fe87d53992535cf57fa2a2099c4fb61b..df2f9d6602201272c19e50ed7e84bca149f743eb 100644 (file)
--- a/zlib/inflate.c
+++ b/zlib/inflate.c
@@ -1523,7 +1523,7 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
 {
     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 :
     state = (struct inflate_state FAR *)strm->state;
     return ((long)(state->back) << 16) +
         (state->mode == COPY ? state->length :