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

This commit is contained in:
pwpiwi 2017-04-11 18:55:33 +02:00
commit 31a29271b9
5 changed files with 7 additions and 7 deletions

View file

@ -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";

View file

@ -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.",

View file

@ -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;