mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

dynamic-string: Fix style of ds_put_hex_dump().

Browse Source 
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>
Tested-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Ben Pfaff
2013-05-15 22:33:11 -07:00
parent a128bd8cbc
commit 9aba74cef5
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/dynamic-string.c
View File

@@ -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. */
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;
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;
/* 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++)
/* 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;
}
}