Simplification of conditions

This commit is contained in:
Roman Kalashnikov 2017-10-28 02:20:18 +03:00 committed by GitHub
parent 216145fba5
commit 1e28b5e4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -279,7 +279,7 @@ snprint_nfc_iso14443a_info(char *dst, size_t size, const nfc_iso14443a_info *pna
off += snprintf(dst + off, size - off, " * Warning: Type Identification Coding length (%i)", L);
off += snprintf(dst + off, size - off, " not matching Tk length (%" PRIdPTR ")\n", (pnai->szAtsLen - offset));
}
if ((pnai->szAtsLen - offset - 2) > 0) { // Omit 2 CRC bytes
if ((pnai->szAtsLen - offset) != 2) { // Omit 2 CRC bytes
uint8_t CTC = pnai->abtAts[offset];
offset++;
off += snprintf(dst + off, size - off, " * Chip Type: ");
@ -322,7 +322,7 @@ snprint_nfc_iso14443a_info(char *dst, size_t size, const nfc_iso14443a_info *pna
break;
}
}
if ((pnai->szAtsLen - offset) > 0) { // Omit 2 CRC bytes
if (pnai->szAtsLen != offset) { // Omit 2 CRC bytes
uint8_t CVC = pnai->abtAts[offset];
offset++;
off += snprintf(dst + off, size - off, " * Chip Status: ");
@ -356,7 +356,7 @@ snprint_nfc_iso14443a_info(char *dst, size_t size, const nfc_iso14443a_info *pna
break;
}
}
if ((pnai->szAtsLen - offset) > 0) { // Omit 2 CRC bytes
if (pnai->szAtsLen != offset) { // Omit 2 CRC bytes
uint8_t VCS = pnai->abtAts[offset];
offset++;
off += snprintf(dst + off, size - off, " * Specifics (Virtual Card Selection):\n");