cppcheck fixes

This commit is contained in:
iceman1001 2023-01-06 23:57:02 +01:00
commit fd39493cac

View file

@ -942,14 +942,14 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
break; break;
case MFDES_READ_DATA: case MFDES_READ_DATA:
if (data_size >= 7) { if (data_size >= 7) {
snprintf(exp, size, "READ DATA (fileId %02x, offset %d, len %d)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4)); snprintf(exp, size, "READ DATA (fileId %02x, offset %u, len %u)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4));
} else { } else {
snprintf(exp, size, "READ DATA"); snprintf(exp, size, "READ DATA");
} }
break; break;
case MFDES_WRITE_DATA: case MFDES_WRITE_DATA:
if (data_size >= 7) { if (data_size >= 7) {
snprintf(exp, size, "WRITE DATA (fileId %02x, offset %d, len %d)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4)); snprintf(exp, size, "WRITE DATA (fileId %02x, offset %u, len %u)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4));
} else { } else {
snprintf(exp, size, "WRITE DATA"); snprintf(exp, size, "WRITE DATA");
} }
@ -984,14 +984,14 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
break; break;
case MFDES_WRITE_RECORD: case MFDES_WRITE_RECORD:
if (data_size >= 7) { if (data_size >= 7) {
snprintf(exp, size, "WRITE RECORD (fileId %02x, offset %d, len %d)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4)); snprintf(exp, size, "WRITE RECORD (fileId %02x, offset %u, len %u)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4));
} else { } else {
snprintf(exp, size, "WRITE RECORD"); snprintf(exp, size, "WRITE RECORD");
} }
break; break;
case MFDES_READ_RECORDS: case MFDES_READ_RECORDS:
if (data_size >= 7) { if (data_size >= 7) {
snprintf(exp, size, "READ RECORDS (fileId %02x, offset %d, len %d)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4)); snprintf(exp, size, "READ RECORDS (fileId %02x, offset %u, len %u)", data[0], MemLeToUint3byte(data + 1), MemLeToUint3byte(data + 4));
} else { } else {
snprintf(exp, size, "READ RECORDS"); snprintf(exp, size, "READ RECORDS");
} }
@ -1086,21 +1086,21 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
break; break;
case MFDES_AUTHENTICATE: case MFDES_AUTHENTICATE:
if (data_size >= 1) { if (data_size >= 1) {
snprintf(exp, size, "AUTH NATIVE (keyNo %d)", data[0]); snprintf(exp, size, "AUTH NATIVE (keyNo %u)", data[0]);
} else { } else {
snprintf(exp, size, "AUTH NATIVE"); snprintf(exp, size, "AUTH NATIVE");
} }
break; // AUTHENTICATE_NATIVE break; // AUTHENTICATE_NATIVE
case MFDES_AUTHENTICATE_ISO: case MFDES_AUTHENTICATE_ISO:
if (data_size >= 1) { if (data_size >= 1) {
snprintf(exp, size, "AUTH ISO (keyNo %d)", data[0]); snprintf(exp, size, "AUTH ISO (keyNo %u)", data[0]);
} else { } else {
snprintf(exp, size, "AUTH ISO"); snprintf(exp, size, "AUTH ISO");
} }
break; // AUTHENTICATE_STANDARD break; // AUTHENTICATE_STANDARD
case MFDES_AUTHENTICATE_AES: case MFDES_AUTHENTICATE_AES:
if (data_size >= 1) { if (data_size >= 1) {
snprintf(exp, size, "AUTH AES (keyNo %d)", data[0]); snprintf(exp, size, "AUTH AES (keyNo %u)", data[0]);
} else { } else {
snprintf(exp, size, "AUTH AES"); snprintf(exp, size, "AUTH AES");
} }
@ -1119,14 +1119,14 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
break; break;
case MFDES_CHANGE_KEY: case MFDES_CHANGE_KEY:
if (data_size >= 1) { if (data_size >= 1) {
snprintf(exp, size, "CHANGE KEY (keyNo %d)", data[0]); snprintf(exp, size, "CHANGE KEY (keyNo %u)", data[0]);
} else { } else {
snprintf(exp, size, "CHANGE KEY"); snprintf(exp, size, "CHANGE KEY");
} }
break; break;
case MFDES_GET_KEY_VERSION: case MFDES_GET_KEY_VERSION:
if (data_size >= 1) { if (data_size >= 1) {
snprintf(exp, size, "GET KEY VERSION (keyNo %d)", data[0]); snprintf(exp, size, "GET KEY VERSION (keyNo %u)", data[0]);
} else { } else {
snprintf(exp, size, "GET KEY VERSION"); snprintf(exp, size, "GET KEY VERSION");
} }