DPDK patches and discussions
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH 2/2] hexdump: align output of string
Date: Thu, 16 Aug 2018 08:31:06 -0700	[thread overview]
Message-ID: <20180816153106.7608-3-stephen@networkplumber.org> (raw)
In-Reply-To: <20180816153106.7608-1-stephen@networkplumber.org>

This fixes the issue where if the length of the output is not
a multiple of 16 the formatting was off.

Before:
00000000: 45 00 00 1C 12 34 2C E0 40 06 B8 2E C0 A8 01 12 | E....4,.@.......
00000010: C0 A8 01 37 |  |  |  |  |  |  |  |  |  |  |  |  | ...7

After:
00000000: 45 00 00 1C 12 34 2C E0 40 06 B8 2E C0 A8 01 12 | E....4,.@.......
00000010: C0 A8 01 37                                     | ...7

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/librte_eal/common/eal_common_hexdump.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_hexdump.c b/lib/librte_eal/common/eal_common_hexdump.c
index 980cf73ac337..19c2d86c693e 100644
--- a/lib/librte_eal/common/eal_common_hexdump.c
+++ b/lib/librte_eal/common/eal_common_hexdump.c
@@ -22,9 +22,16 @@ void rte_hexdump(FILE *f, const char *title, const void *buf, unsigned int len)
 	while (ofs < len) {
 		/* format the line in the buffer */
 		out = snprintf(line, LINE_LEN, "%08X:", ofs);
-		for (i = 0; i < 16 && ofs + i < len; i++)
-			out += snprintf(line + out, LINE_LEN - out,
+		for (i = 0; i < 16; i++) {
+			if (ofs + i < len)
+				snprintf(line + out, LINE_LEN - out,
 					 " %02X", (data[ofs + i] & 0xff));
+			else
+				strcpy(line + out, "   ");
+			out += 3;
+		}
+
+
 		for (; i <= 16; i++)
 			out += snprintf(line + out, LINE_LEN - out, " | ");
 
-- 
2.18.0

  parent reply	other threads:[~2018-08-16 15:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-16 15:31 [dpdk-dev] [PATCH 0/2] eal: hexcump trivial changes Stephen Hemminger
2018-08-16 15:31 ` [dpdk-dev] [PATCH 1/2] hexdump: whitespace cleanup Stephen Hemminger
2018-08-16 16:34   ` Wiles, Keith
2018-08-16 16:59     ` Stephen Hemminger
2018-08-16 16:35   ` Wiles, Keith
2018-08-16 15:31 ` Stephen Hemminger [this message]
2018-08-16 15:50   ` [dpdk-dev] [PATCH 2/2] hexdump: align output of string Stephen Hemminger
2018-10-24 23:40 ` [dpdk-dev] [PATCH 0/2] eal: hexcump trivial changes Thomas Monjalon
2019-04-02 15:23 ` [dpdk-dev] [PATCH v2 0/2] eal: hexdump cleanups Stephen Hemminger
2019-04-02 15:23   ` Stephen Hemminger
2019-04-02 15:23   ` [dpdk-dev] [PATCH v2 1/2] hexdump: whitespace cleanup Stephen Hemminger
2019-04-02 15:23     ` Stephen Hemminger
2019-04-02 15:23   ` [dpdk-dev] [PATCH v2 2/2] hexdump: align output of string Stephen Hemminger
2019-04-02 15:23     ` Stephen Hemminger
2019-04-03 16:36   ` [dpdk-dev] [PATCH v2 0/2] eal: hexdump cleanups Thomas Monjalon
2019-04-03 16:36     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180816153106.7608-3-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).