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

simplify logic

Browse source
This commit is contained in:
iceman1001 2023-06-15 22:47:21 +02:00
commit 620e5f4951
1 changed files with 10 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

44
client/src/cmdtrace.c
View file

@ -660,26 +660,14 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
char *cb_str = str_dup(pos1 + 1); char *cb_str = str_dup(pos1 + 1);
if (hdr->isResponse) { if (g_session.supports_colors) {
if (g_session.supports_colors) { if (crcStatus == 0) {
if (crcStatus == 0) { snprintf(pos1, 24, AEND " " _RED_("%s"), cb_str);
snprintf(pos1, 24, AEND " " _RED_("%s"), cb_str);
} else {
snprintf(pos1, 24, AEND " " _GREEN_("%s"), cb_str);
}
} else { } else {
snprintf(pos1, 9, "[%s]", cb_str); snprintf(pos1, 24, AEND " " _GREEN_("%s"), cb_str);
} }
} else { } else {
if (g_session.supports_colors) { snprintf(pos1, 9, "[%s]", cb_str);
if (crcStatus == 0) {
snprintf(pos1, 24, AEND " " _RED_("%s"), cb_str);
} else {
snprintf(pos1, 24, AEND " " _GREEN_("%s"), cb_str);
}
} else {
snprintf(pos1, 9, "[%s]", cb_str);
}
} }
// odd case of second crc byte is alone in a new line // odd case of second crc byte is alone in a new line
@ -690,26 +678,14 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
pos1 = line[((data_len - 2) / TRACE_MAX_HEX_BYTES) + 1]; pos1 = line[((data_len - 2) / TRACE_MAX_HEX_BYTES) + 1];
cb_str = str_dup(pos1); cb_str = str_dup(pos1);
if (hdr->isResponse) { if (g_session.supports_colors) {
if (g_session.supports_colors) { if (crcStatus == 0) {
if (crcStatus == 0) { snprintf(pos1, 24, _RED_("%s"), cb_str);
snprintf(pos1, 24, _RED_("%s"), cb_str);
} else {
snprintf(pos1, 24, _GREEN_("%s"), cb_str);
}
} else { } else {
snprintf(pos1, 9, "[%s]", cb_str); snprintf(pos1, 24, _GREEN_("%s"), cb_str);
} }
} else { } else {
if (g_session.supports_colors) { snprintf(pos1, 9, "[%s]", cb_str);
if (crcStatus == 0) {
snprintf(pos1, 24, _RED_("%s"), cb_str);
} else {
snprintf(pos1, 24, _GREEN_("%s"), cb_str);
}
} else {
snprintf(pos1, 9, "[%s]", cb_str);
}
} }
} }