From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758357AbbKSKIb (ORCPT ); Thu, 19 Nov 2015 05:08:31 -0500 Received: from mail-lf0-f53.google.com ([209.85.215.53]:36579 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758210AbbKSKI0 (ORCPT ); Thu, 19 Nov 2015 05:08:26 -0500 From: Rasmus Villemoes To: Andy Shevchenko Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 4/7] test_hexdump: replace magic numbers by their meaning Organization: D03 References: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com> <1447259718-19647-5-git-send-email-andriy.shevchenko@linux.intel.com> X-Hashcash: 1:20:151119:andriy.shevchenko@linux.intel.com::bNEbheci4yJ7YtRJ:000000000000000000000000000019SD X-Hashcash: 1:20:151119:linux-kernel@vger.kernel.org::krpg1tCt8ub14a2+:0000000000000000000000000000000001T8c X-Hashcash: 1:20:151119:akpm@linux-foundation.org::iyvyv18TZwM/mHeN:000000000000000000000000000000000000FlBA Date: Thu, 19 Nov 2015 11:08:23 +0100 In-Reply-To: <1447259718-19647-5-git-send-email-andriy.shevchenko@linux.intel.com> (Andy Shevchenko's message of "Wed, 11 Nov 2015 18:35:15 +0200") Message-ID: <87poz6s3mw.fsf@rasmusvillemoes.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 11 2015, Andy Shevchenko wrote: > The magic numbers of the length are converted to their actual meaning, such as > end of the buffer with and without ASCII part. > > We don't touch the rest magic constants that will be removed in the following > commits. > > Signed-off-by: Andy Shevchenko > --- > lib/test_hexdump.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c > index 15a6440..a3e3b01 100644 > --- a/lib/test_hexdump.c > +++ b/lib/test_hexdump.c > @@ -130,18 +130,23 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii) > { > char buf[TEST_HEXDUMP_BUF_SIZE]; > const char *t = test_data_1_le[0]; > + size_t len = 1; > size_t l = buflen; > + int rs = 16, gs = 1; > + int ae, he, e, r; > bool a; > - int e, r; > > memset(buf, ' ', sizeof(buf)); > > - r = hex_dump_to_buffer(data_b, 1, 16, 1, buf, buflen, ascii); > + r = hex_dump_to_buffer(data_b, len, rs, gs, buf, buflen, ascii); > + > + ae = rs * 2 /* hex */ + rs / gs /* spaces */ + 1 /* space */ + len /* ascii */; > + he = (gs * 2 /* hex */ + 1 /* space */) * len / gs - 1 /* no trailing space */; This computation seems to rely on len being an exact multiple of gs - which of course it is in this case. hex_dump_to_buffer also enforces it by setting groupsize to 1 when it's not the case, but that doesn't really help us here. So maybe an extra comment would be justified. Rasmus