p
/
hex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make app_decode() more functional

This commit is contained in:
Přemysl Eric Janouch 2017-01-17 14:00:02 +01:00
parent 1c3a1172d3
commit d2aed61783
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hex.c
View File

@ -419,10 +419,10 @@ app_draw_view (void)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static uint64_t static uint64_t
app_decode (const uint8_t *p, size_t len) app_decode (const uint8_t *p, size_t len, enum endianity endianity)
{ {
uint64_t val = 0; uint64_t val = 0;
if (g_ctx.endianity == ENDIANITY_BE) if (endianity == ENDIANITY_BE)
for (size_t i = 0; i < len; i++) for (size_t i = 0; i < len; i++)
val = val << 8 | (uint64_t) p[i]; val = val << 8 | (uint64_t) p[i];
else else
@ -528,21 +528,21 @@ app_draw_footer (void)
} }
if (len >= 2) if (len >= 2)
{ {
uint16_t val = app_decode (p, 2); uint16_t val = app_decode (p, 2, g_ctx.endianity);
app_footer_field (&x, 'x', 2, " %04x ", val); app_footer_field (&x, 'x', 2, " %04x ", val);
app_footer_field (&u, 'u', 2, " %6u ", val); app_footer_field (&u, 'u', 2, " %6u ", val);
app_footer_field (&s, 's', 2, " %6d ", (int16_t) val); app_footer_field (&s, 's', 2, " %6d ", (int16_t) val);
} }
if (len >= 4) if (len >= 4)
{ {
uint32_t val = app_decode (p, 4); uint32_t val = app_decode (p, 4, g_ctx.endianity);
app_footer_field (&x, 'x', 4, " %08x ", val); app_footer_field (&x, 'x', 4, " %08x ", val);
app_footer_field (&u, 'u', 4, " %11u ", val); app_footer_field (&u, 'u', 4, " %11u ", val);
app_footer_field (&s, 's', 4, " %11d ", (int32_t) val); app_footer_field (&s, 's', 4, " %11d ", (int32_t) val);
} }
if (len >= 8) if (len >= 8)
{ {
uint64_t val = app_decode (p, 8); uint64_t val = app_decode (p, 8, g_ctx.endianity);
app_footer_field (&x, 'x', 8, " %016" PRIx64, val); app_footer_field (&x, 'x', 8, " %016" PRIx64, val);
app_footer_field (&u, 'u', 8, " %20" PRIu64, val); app_footer_field (&u, 'u', 8, " %20" PRIu64, val);
app_footer_field (&s, 's', 8, " %20" PRId64, (int64_t) val); app_footer_field (&s, 's', 8, " %20" PRId64, (int64_t) val);