mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Correct dump_hex output 

Changed dump_hex so that there is only one call to rig_debug()
per line.

Signed-off-by: Nate Bargmann <n0nb@n0nb.us>
Hamlib-1.2.14
Nirgal Vourgère 2011-06-19 23:43:53 +00:00 zatwierdzone przez Nate Bargmann
rodzic 72c52d6e9a
commit b0f9f805bb
1 zmienionych plików z 38 dodań i 40 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

48
src/debug.c
Wyświetl plik

@ -60,41 +60,39 @@ static rig_ptr_t rig_vprintf_arg;
*/ */
void dump_hex(const unsigned char ptr[], size_t size) void dump_hex(const unsigned char ptr[], size_t size)
{ {
/* example
* 0000 4b 30 30 31 34 35 30 30 30 30 30 30 30 35 30 32 K001450000000502
* 0010 30 30 0d 0a 00..
*/
char line[4 + 4 + 3 * DUMP_HEX_WIDTH + 4 + DUMP_HEX_WIDTH + 1];
unsigned char c;
int i; int i;
char buf[DUMP_HEX_WIDTH+1];
if (!rig_need_debug(RIG_DEBUG_TRACE)) if (!rig_need_debug(RIG_DEBUG_TRACE))
return; return;
/* ASCII column */ line[sizeof(line) - 1] = '\0';
buf[DUMP_HEX_WIDTH] = '\0';
for(i=0; i<size; i++) { for (i = 0; i < size; ++i) {
if (i % DUMP_HEX_WIDTH == 0) if (i % DUMP_HEX_WIDTH == 0) {
rig_debug(RIG_DEBUG_TRACE,"%.4x ",i); /* new line */
sprintf(line + 0, "%04x", i);
rig_debug(RIG_DEBUG_TRACE," %.2x", ptr[i]); memset(line + 4, ' ', sizeof(line) - 4 - 1);
/* printable ASCII? */
if (ptr[i] >= ' ' && ptr[i] < 0x7f)
buf[i%DUMP_HEX_WIDTH] = ptr[i];
else
buf[i%DUMP_HEX_WIDTH] = '.';
if (i % DUMP_HEX_WIDTH == DUMP_HEX_WIDTH-1)
rig_debug(RIG_DEBUG_TRACE," %s\n",buf);
} }
if (i % DUMP_HEX_WIDTH != 0) { c = ptr[i];
/* Add some spaces in order to align right ASCII dump column */
int j;
for (j = i % DUMP_HEX_WIDTH; j < DUMP_HEX_WIDTH; j++)
rig_debug(RIG_DEBUG_TRACE," ");
buf[i % DUMP_HEX_WIDTH] = '\0'; /* hex print */
rig_debug(RIG_DEBUG_TRACE," %s\n",buf); sprintf(line + 8 + 3 * (i % DUMP_HEX_WIDTH), "%02x", c);
line[8 + 3 * (i % DUMP_HEX_WIDTH) + 2] = ' '; /* no \0 */
/* ascii print */
line[8 + 3 * DUMP_HEX_WIDTH + 4 + (i % DUMP_HEX_WIDTH)] = (c >= ' ' && c < 0x7f) ? c : '.';
/* actually print the line */
if (i + 1 == size || (i && i % DUMP_HEX_WIDTH == DUMP_HEX_WIDTH - 1))
rig_debug(RIG_DEBUG_TRACE, "%s\n", line);
} }
} }