From: Ben Pfaff Date: Thu, 16 May 2013 05:33:11 +0000 (-0700) Subject: dynamic-string: Fix style of ds_put_hex_dump(). X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~250 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9aba74cef5aeadd6cec8addaf6a57bd6dfe4fd02;p=sliver-openvswitch.git dynamic-string: Fix style of ds_put_hex_dump(). Signed-off-by: Ben Pfaff Acked-by: Kyle Mestery Tested-by: Simon Horman --- diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c index ba9aa6dd6..b35fd0b67 100644 --- a/lib/dynamic-string.c +++ b/lib/dynamic-string.c @@ -358,48 +358,48 @@ void ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size, uintptr_t ofs, bool ascii) { - const uint8_t *buf = buf_; - const size_t per_line = 16; /* Maximum bytes per line. */ - - while (size > 0) - { - size_t start, end, n; - size_t i; - - /* Number of bytes on this line. */ - start = ofs % per_line; - end = per_line; - if (end - start > size) - end = start + size; - n = end - start; - - /* Print line. */ - ds_put_format(ds, "%08jx ", (uintmax_t) ROUND_DOWN(ofs, per_line)); - for (i = 0; i < start; i++) - ds_put_format(ds, " "); - for (; i < end; i++) - ds_put_format(ds, "%02hhx%c", - buf[i - start], i == per_line / 2 - 1? '-' : ' '); - if (ascii) - { - for (; i < per_line; i++) + const uint8_t *buf = buf_; + const size_t per_line = 16; /* Maximum bytes per line. */ + + while (size > 0) { + size_t start, end, n; + size_t i; + + /* Number of bytes on this line. */ + start = ofs % per_line; + end = per_line; + if (end - start > size) + end = start + size; + n = end - start; + + /* Print line. */ + ds_put_format(ds, "%08jx ", (uintmax_t) ROUND_DOWN(ofs, per_line)); + for (i = 0; i < start; i++) { ds_put_format(ds, " "); - ds_put_format(ds, "|"); - for (i = 0; i < start; i++) - ds_put_format(ds, " "); - for (; i < end; i++) { - int c = buf[i - start]; - ds_put_char(ds, c >= 32 && c < 127 ? c : '.'); - } - for (; i < per_line; i++) - ds_put_format(ds, " "); - ds_put_format(ds, "|"); } - ds_put_format(ds, "\n"); + for (; i < end; i++) { + ds_put_format(ds, "%02hhx%c", + buf[i - start], i == per_line / 2 - 1? '-' : ' '); + } + if (ascii) { + for (; i < per_line; i++) + ds_put_format(ds, " "); + ds_put_format(ds, "|"); + for (i = 0; i < start; i++) + ds_put_format(ds, " "); + for (; i < end; i++) { + int c = buf[i - start]; + ds_put_char(ds, c >= 32 && c < 127 ? c : '.'); + } + for (; i < per_line; i++) + ds_put_format(ds, " "); + ds_put_format(ds, "|"); + } + ds_put_format(ds, "\n"); - ofs += n; - buf += n; - size -= n; + ofs += n; + buf += n; + size -= n; } }