This commit is contained in:
iceman1001 2019-10-09 15:23:58 +02:00
commit 69274a1184

View file

@ -153,6 +153,8 @@ static uint16_t printHexLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trac
return tracepos; return tracepos;
} }
uint16_t ret;
switch (protocol) { switch (protocol) {
case ISO_14443A: { case ISO_14443A: {
/* https://www.kaiser.cx/pcap-iso14443.html defines a pseudo header: /* https://www.kaiser.cx/pcap-iso14443.html defines a pseudo header:
@ -185,16 +187,14 @@ static uint16_t printHexLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trac
temp_str1, temp_str1,
temp_str2, temp_str2,
line); line);
return tracepos; ret = tracepos;
} }
default: default:
PrintAndLogEx(NORMAL, "Currently only 14a supported"); PrintAndLogEx(NORMAL, "Currently only 14a supported");
return traceLen; ret = traceLen;
} }
if (is_last_record(tracepos, trace, traceLen)) return traceLen; return ret;
return tracepos;
} }
static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) { static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {