1
0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-23 18:27:28 -08:00

Bugfix: Output typing on print of HID card formats ()

* Bugfix: Output typing on print of HID card formats

The 'PrintAndLog' calls were using signed types and sometimes too few bits in width for formatting/outputting the data as was revealed in the forums. This commit will correct the printf-formatted output typing on display of the fields.

* Update hidcardformats.c

Updated to use macros as requested by @pwpiwi
This commit is contained in:
grauerfuchs 2019-12-06 10:06:24 -05:00 committed by pwpiwi
parent 28ae37b746
commit 763d1befc1

@ -574,13 +574,13 @@ bool HIDPack(/* in */int FormatIndex, /* in */hidproxcard_t* card, /* out */hidp
void HIDDisplayUnpackedCard(hidproxcard_t* card, const hidcardformat_t format){
PrintAndLog(" Format: %s (%s)", format.Name, format.Descrp);
if (format.Fields.hasFacilityCode)
PrintAndLog("Facility Code: %d",card->FacilityCode);
PrintAndLog("Facility Code: %" PRIu32,card->FacilityCode);
if (format.Fields.hasCardNumber)
PrintAndLog(" Card Number: %d",card->CardNumber);
PrintAndLog(" Card Number: %" PRIu64,card->CardNumber);
if (format.Fields.hasIssueLevel)
PrintAndLog(" Issue Level: %d",card->IssueLevel);
PrintAndLog(" Issue Level: %" PRIu32,card->IssueLevel);
if (format.Fields.hasOEMCode)
PrintAndLog(" OEM Code: %d",card->OEM);
PrintAndLog(" OEM Code: %" PRIu32,card->OEM);
if (format.Fields.hasParity)
PrintAndLog(" Parity: %s",card->ParityValid ? "Valid" : "Invalid");
}