mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

util: Fix style in ovs_hex_dump().

Browse Source 
Reported-by: Russell Bryant <russell@ovn.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Russell Bryant <russell@ovn.org>
This commit is contained in:
Ben Pfaff
2017-10-09 10:34:55 -07:00
parent f92ef1a8e8
commit 172cc6c100
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
lib/util.c
View File

@@ -642,49 +642,53 @@ void
ovs_hex_dump(FILE *stream, 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 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. */
fprintf(stream, "%08"PRIxMAX" ", (uintmax_t) ROUND_DOWN(ofs, per_line));
for (i = 0; i < start; i++)
fprintf(stream, " ");
for (; i < end; i++)
fprintf(stream, "%c%02x",
i == per_line / 2 ? '-' : ' ', buf[i - start]);
if (ascii)
{
fprintf(stream, " ");
for (; i < per_line; i++)
fprintf(stream, " ");
fprintf(stream, "|");
for (i = 0; i < start; i++)
fprintf(stream, " ");
for (; i < end; i++) {
int c = buf[i - start];
putc(c >= 32 && c < 127 ? c : '.', stream);
}
for (; i < per_line; i++)
fprintf(stream, " ");
fprintf(stream, "|");
/* Number of bytes on this line. */
size_t start = ofs % per_line;
size_t end = per_line;
if (end - start > size) {
end = start + size;
}
fprintf(stream, "\n");
size_t n = end - start;
ofs += n;
buf += n;
size -= n;
/* Print line. */
fprintf(stream, "%08"PRIxMAX" ",
(uintmax_t) ROUND_DOWN(ofs, per_line));
for (i = 0; i < start; i++) {
fprintf(stream, " ");
}
for (; i < end; i++) {
fprintf(stream, "%c%02x",
i == per_line / 2 ? '-' : ' ', buf[i - start]);
}
if (ascii) {
fprintf(stream, " ");
for (; i < per_line; i++) {
fprintf(stream, " ");
}
fprintf(stream, "|");
for (i = 0; i < start; i++) {
fprintf(stream, " ");
}
for (; i < end; i++) {
int c = buf[i - start];
putc(c >= 32 && c < 127 ? c : '.', stream);
}
for (; i < per_line; i++) {
fprintf(stream, " ");
}
fprintf(stream, "|");
}
fprintf(stream, "\n");
ofs += n;
buf += n;
size -= n;
}
}