nanddump: Refactor pretty print code into an sprintf()

A do-while loop in pretty_dump_to_buffer() can be refactored into a
single sprintf() statement. MAX() and MIN() are used to ensure that:
(1) We have at least a single space between hex and ASCII output
(2) We don't overflow the line buffer

This patch was suggested by Mike Frysinger.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/nanddump.c b/nanddump.c
index bf95e81f0232f1469c400395ca5d4734cab155c9..14a8816cc501cf1170ba9996708474cff0ef0f38 100644 (file)
--- a/nanddump.c
+++ b/nanddump.c
@@ -252,9 +252,10 @@ static void pretty_dump_to_buffer(const unsigned char *buf, size_t len,
        if (!ascii)
                goto nil;
 
-       do {
-               linebuf[lx++] = ' ';
-       } while (lx < (linebuflen - 1) && lx < (ascii_column - 1));
+       /* Spacing between hex and ASCII - ensure at least one space */
+       lx += sprintf(linebuf + lx, "%*s",
+                       MAX((int)MIN(linebuflen, ascii_column) - 1 - lx, 1),
+                       " ");
 
        linebuf[lx++] = '|';
        for (j = 0; (j < len) && (lx + 2) < linebuflen; j++)