From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Hemminger <stephen@networkplumber.org>
Subject: Re: [PATCH 2/2] hexdump: align output of string
Date: Thu, 16 Aug 2018 08:50:49 -0700
Message-ID: <20180816085049.1339e17f@xeon-e3>
References: <20180816153106.7608-1-stephen@networkplumber.org>
 <20180816153106.7608-3-stephen@networkplumber.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
To: dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com
 [209.85.160.68]) by dpdk.org (Postfix) with ESMTP id 653CB47CD
 for <dev@dpdk.org>; Thu, 16 Aug 2018 17:50:52 +0200 (CEST)
Received: by mail-pl0-f68.google.com with SMTP id ba4-v6so2280990plb.11
 for <dev@dpdk.org>; Thu, 16 Aug 2018 08:50:52 -0700 (PDT)
Received: from xeon-e3 (204-195-22-127.wavecable.com. [204.195.22.127])
 by smtp.gmail.com with ESMTPSA id 2-v6sm50175693pfs.58.2018.08.16.08.50.51
 for <dev@dpdk.org>
 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
 Thu, 16 Aug 2018 08:50:51 -0700 (PDT)
In-Reply-To: <20180816153106.7608-3-stephen@networkplumber.org>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

On Thu, 16 Aug 2018 08:31:06 -0700
Stephen Hemminger <stephen@networkplumber.org> wrote:

> 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, " | ");
>  

Nevermind, this version.
The last two lines are dead code after tha patch and could be dropped.