All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 2/7] test_hexdump: introduce test_hexdump_prepare_test() helper
Date: Wed, 11 Nov 2015 18:35:13 +0200	[thread overview]
Message-ID: <1447259718-19647-3-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com>

The function prepares the expected result in the provided buffer.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 lib/test_hexdump.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c
index 5241df3..ed7c6a7 100644
--- a/lib/test_hexdump.c
+++ b/lib/test_hexdump.c
@@ -42,19 +42,16 @@ static const char * const test_data_8_le[] __initconst = {
 	"e9ac0f9cad319ca6", "0cafb1439919d14c",
 };
 
-static void __init test_hexdump(size_t len, int rowsize, int groupsize,
-				bool ascii)
+static void __init test_hexdump_prepare_test(size_t len, int rowsize,
+					     int groupsize, char *test,
+					     size_t testlen, bool ascii)
 {
-	char test[32 * 3 + 2 + 32 + 1];
-	char real[32 * 3 + 2 + 32 + 1];
 	char *p;
 	const char * const *result;
 	size_t l = len;
 	int gs = groupsize, rs = rowsize;
 	unsigned int i;
 
-	hex_dump_to_buffer(data_b, l, rs, gs, real, sizeof(real), ascii);
-
 	if (rs != 16 && rs != 32)
 		rs = 16;
 
@@ -73,7 +70,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
 	else
 		result = test_data_1_le;
 
-	memset(test, ' ', sizeof(test));
+	memset(test, ' ', testlen);
 
 	/* hex dump */
 	p = test;
@@ -95,6 +92,21 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
 	}
 
 	*p = '\0';
+}
+
+#define TEST_HEXDUMP_BUF_SIZE		(32 * 3 + 2 + 32 + 1)
+
+static void __init test_hexdump(size_t len, int rowsize, int groupsize,
+				bool ascii)
+{
+	char test[TEST_HEXDUMP_BUF_SIZE];
+	char real[TEST_HEXDUMP_BUF_SIZE];
+
+	hex_dump_to_buffer(data_b, len, rowsize, groupsize, real, sizeof(real),
+			   ascii);
+
+	test_hexdump_prepare_test(len, rowsize, groupsize, test, sizeof(test),
+				  ascii);
 
 	if (strcmp(test, real)) {
 		pr_err("Len: %zu row: %d group: %d\n", len, rowsize, groupsize);
-- 
2.6.2


  parent reply	other threads:[~2015-11-11 16:36 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-11 16:35 [PATCH v1 0/7] hexdump: update test suite Andy Shevchenko
2015-11-11 16:35 ` [PATCH v1 1/7] test_hexdump: rename to test_hexdump Andy Shevchenko
2015-11-19 10:05   ` Rasmus Villemoes
2015-11-11 16:35 ` Andy Shevchenko [this message]
2015-11-19 10:05   ` [PATCH v1 2/7] test_hexdump: introduce test_hexdump_prepare_test() helper Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 3/7] test_hexdump: go through all possible lengths of buffer Andy Shevchenko
2015-11-19 10:07   ` Rasmus Villemoes
2015-11-20 16:58     ` Andy Shevchenko
2015-11-23  8:59       ` Rasmus Villemoes
2015-11-26 15:22         ` Andy Shevchenko
2015-11-11 16:35 ` [PATCH v1 4/7] test_hexdump: replace magic numbers by their meaning Andy Shevchenko
2015-11-19 10:08   ` Rasmus Villemoes
2015-11-20 16:56     ` Andy Shevchenko
2015-11-11 16:35 ` [PATCH v1 5/7] test_hexdump: check all bytes in real buffer Andy Shevchenko
2015-11-19 10:11   ` Rasmus Villemoes
2015-11-20 16:55     ` Andy Shevchenko
2015-11-23  9:28       ` Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 6/7] test_hexdump: test all possible group sizes for overflow Andy Shevchenko
2015-11-19 10:14   ` Rasmus Villemoes
2015-11-20 16:43     ` Andy Shevchenko
2015-11-23  9:36       ` Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 7/7] test_hexdump: print statistics at the end Andy Shevchenko
2015-11-19 10:16   ` Rasmus Villemoes

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=1447259718-19647-3-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.