From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752711AbbKKQgZ (ORCPT ); Wed, 11 Nov 2015 11:36:25 -0500 Received: from mga01.intel.com ([192.55.52.88]:54217 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239AbbKKQgX (ORCPT ); Wed, 11 Nov 2015 11:36:23 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,276,1444719600"; d="scan'208";a="598376343" From: Andy Shevchenko To: Rasmus Villemoes , Andrew Morton , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 4/7] test_hexdump: replace magic numbers by their meaning Date: Wed, 11 Nov 2015 18:35:15 +0200 Message-Id: <1447259718-19647-5-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */; if (ascii) - e = 50; + e = ae; else - e = 2; + e = he; buf[e + 2] = '\0'; if (!buflen) { -- 2.6.2