github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-05 20:51:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
pwpiwi 2017-04-11 18:55:33 +02:00
parent 8aee1b8418
commit 31a29271b9
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhfepa.c
View file

@ -86,7 +86,7 @@ int CmdHFEPAPACEReplay(const char *Cmd)
uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu}; uint8_t *apdus[] = {msesa_apdu, gn_apdu, map_apdu, pka_apdu, ma_apdu};
// usage message // usage message
static const char const *usage_msg = static const char *usage_msg =
"Please specify 5 APDUs separated by spaces. " "Please specify 5 APDUs separated by spaces. "
"Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D"; "Example:\n preplay 0022C1A4 1068000000 1086000002 1234ABCDEF 1A2B3C4D";

2
client/cmdhftopaz.c
View file

@ -337,7 +337,7 @@ static void topaz_print_control_TLVs(uint8_t *memory)
if (TLV_type == 0x02) { // a Reserved Memory Control TLV if (TLV_type == 0x02) { // a Reserved Memory Control TLV
uint8_t pages_addr = TLV_value[0] >> 4; uint8_t pages_addr = TLV_value[0] >> 4;
uint8_t byte_offset = TLV_value[0] & 0x0f; 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); uint8_t bytes_per_page = 1 << (TLV_value[2] & 0x0f);
uint16_t area_start = pages_addr * bytes_per_page + byte_offset; uint16_t area_start = pages_addr * bytes_per_page + byte_offset;
PrintAndLog("Reserved Memory of %d bytes at byte offset 0x%02x.", PrintAndLog("Reserved Memory of %d bytes at byte offset 0x%02x.",

4
client/reveng/poly.c
View file

@ -139,7 +139,7 @@ filtop(FILE *input, unsigned long length, int flags, int bperhx) {
bmp_t accu = BMP_C(0); bmp_t accu = BMP_C(0);
bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1); bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
unsigned long iter = 0UL, idx; unsigned long iter = 0UL, idx;
int cmask = ~(~0 << CHAR_BIT), c; int cmask = ~(~0U << CHAR_BIT), c;
int count = 0, ofs; int count = 0, ofs;
poly_t poly = PZERO; poly_t poly = PZERO;
if(bperhx == 0) return(poly); if(bperhx == 0) return(poly);
@ -204,7 +204,7 @@ strtop(const char *string, int flags, int bperhx) {
bmp_t accu; bmp_t accu;
bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1); bmp_t mask = bperhx == BMP_BIT ? ~BMP_C(0) : (BMP_C(1) << bperhx) - BMP_C(1);
int pass, count, ofs; int pass, count, ofs;
int cmask = ~(~0 << CHAR_BIT), c; int cmask = ~(~0U << CHAR_BIT), c;
const char *s; const char *s;
poly_t poly = PZERO; poly_t poly = PZERO;

4
common/crapto1/crapto1.c
View file

@ -99,7 +99,7 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
/** binsearch /** binsearch
* Binary search for the first occurence of *stop's MSB in sorted [start,stop] * 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; uint32_t mid, val = *stop & 0xff000000;
while(start != stop) while(start != stop)
@ -110,7 +110,7 @@ static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
return start; return start;
} }
*/
/** update_contribution /** update_contribution
* helper, calculates the partial linear feedback contributions and puts in MSB * helper, calculates the partial linear feedback contributions and puts in MSB
*/ */

2
zlib/inflate.c
View file

@ -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; state = (struct inflate_state FAR *)strm->state;
return ((long)(state->back) << 16) + return ((long)(state->back) << 16) +
(state->mode == COPY ? state->length : (state->mode == COPY ? state->length :