github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 15:15:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

string formatter

Browse source
This commit is contained in:
iceman1001 2023-03-04 21:25:44 +01:00
commit 855f13d763
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/nfc/ndef.c
View file

@ -1069,16 +1069,16 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "--- " _CYAN_("NDEF Memory Control") " ---"); PrintAndLogEx(SUCCESS, "--- " _CYAN_("NDEF Memory Control") " ---");
if (len != 3) { if (len != 3) {
PrintAndLogEx(WARNING, "NDEF Memory Control block size must be 3 instead of %d", len); PrintAndLogEx(WARNING, "NDEF Memory Control block size must be 3 instead of %u", len);
} else { } else {
uint8_t pages_addr = (ndef[indx] >> 4) & 0x0f; uint8_t pages_addr = (ndef[indx] >> 4) & 0x0f;
uint8_t byte_offset = ndef[indx] & 0x0f; uint8_t byte_offset = ndef[indx] & 0x0f;
uint8_t Size = ndef[indx + 1]; uint8_t Size = ndef[indx + 1];
uint8_t bytes_per_page = ndef[indx + 2] & 0x0f; uint8_t bytes_per_page = ndef[indx + 2] & 0x0f;
PrintAndLogEx(SUCCESS, "Pages addr (number of pages).... %d", pages_addr); PrintAndLogEx(SUCCESS, "Pages addr (number of pages).... %u", pages_addr);
PrintAndLogEx(SUCCESS, "Byte offset (number of bytes)... %d", byte_offset); PrintAndLogEx(SUCCESS, "Byte offset (number of bytes)... %u", byte_offset);
PrintAndLogEx(SUCCESS, "Reserved area size in bits...... %d ( %d bytes )", Size, Size / 8); PrintAndLogEx(SUCCESS, "Reserved area size in bits...... %u ( %u bytes )", Size, Size / 8);
PrintAndLogEx(SUCCESS, " Number of bytes / page... %d", bytes_per_page); PrintAndLogEx(SUCCESS, " Number of bytes / page... %u", bytes_per_page);
} }
indx += len; indx += len;
break; break;
@ -1091,7 +1091,7 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
if (len == 0) { if (len == 0) {
PrintAndLogEx(SUCCESS, "Found NDEF message w zero length"); PrintAndLogEx(SUCCESS, "Found NDEF message w zero length");
} else { } else {
PrintAndLogEx(SUCCESS, "Found NDEF message ( " _YELLOW_("%d") " bytes )", len); PrintAndLogEx(SUCCESS, "Found NDEF message ( " _YELLOW_("%u") " bytes )", len);
int res = NDEFRecordsDecodeAndPrint(&ndef[indx], len, verbose); int res = NDEFRecordsDecodeAndPrint(&ndef[indx], len, verbose);
if (res != PM3_SUCCESS) if (res != PM3_SUCCESS)