public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/hexdump.c: reduce stack variable size and cleanups

Browse source 
Reduce char linebuf[200] to the actual size required., which is 32 * 3 + 2
+ 32 + 1, ie: linebuf[131].

Change examples to use bool true not int 1.

Align multiline argument indentation to open parenthesis.

Use temporary for ptr[j] so trigraph fits on single line.

Convert printk ptr from %*p, (int)(2 * sizeof(void *)) to %p as %p uses
the same calculation for size.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2010-05-24 14:33:22 -07:00 • committed by Linus Torvalds
parent 2b2f68b538
commit db0fd97c27
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/hexdump.c
View file

@ -34,7 +34,7 @@ EXPORT_SYMBOL(hex_asc);
* *
* E.g.: * E.g.:
* hex_dump_to_buffer(frame->data, frame->len, 16, 1, * hex_dump_to_buffer(frame->data, frame->len, 16, 1,
* linebuf, sizeof(linebuf), 1); * linebuf, sizeof(linebuf), true);
* *
* example output buffer: * example output buffer:
* 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f @ABCDEFGHIJKLMNO * 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f @ABCDEFGHIJKLMNO
@ -65,8 +65,8 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
for (j = 0; j < ngroups; j++) for (j = 0; j < ngroups; j++)
lx += scnprintf(linebuf + lx, linebuflen - lx, lx += scnprintf(linebuf + lx, linebuflen - lx,
"%s%16.16llx", j ? " " : "", "%s%16.16llx", j ? " " : "",
(unsigned long long)*(ptr8 + j)); (unsigned long long)*(ptr8 + j));
ascii_column = 17 * ngroups + 2; ascii_column = 17 * ngroups + 2;
break; break;
} }
@ -77,7 +77,7 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
for (j = 0; j < ngroups; j++) for (j = 0; j < ngroups; j++)
lx += scnprintf(linebuf + lx, linebuflen - lx, lx += scnprintf(linebuf + lx, linebuflen - lx,
"%s%8.8x", j ? " " : "", *(ptr4 + j)); "%s%8.8x", j ? " " : "", *(ptr4 + j));
ascii_column = 9 * ngroups + 2; ascii_column = 9 * ngroups + 2;
break; break;
} }
@ -88,7 +88,7 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
for (j = 0; j < ngroups; j++) for (j = 0; j < ngroups; j++)
lx += scnprintf(linebuf + lx, linebuflen - lx, lx += scnprintf(linebuf + lx, linebuflen - lx,
"%s%4.4x", j ? " " : "", *(ptr2 + j)); "%s%4.4x", j ? " " : "", *(ptr2 + j));
ascii_column = 5 * ngroups + 2; ascii_column = 5 * ngroups + 2;
break; break;
} }
@ -111,9 +111,10 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
while (lx < (linebuflen - 1) && lx < (ascii_column - 1)) while (lx < (linebuflen - 1) && lx < (ascii_column - 1))
linebuf[lx++] = ' '; linebuf[lx++] = ' ';
for (j = 0; (j < len) && (lx + 2) < linebuflen; j++) for (j = 0; (j < len) && (lx + 2) < linebuflen; j++) {
linebuf[lx++] = (isascii(ptr[j]) && isprint(ptr[j])) ? ptr[j] ch = ptr[j];
: '.'; linebuf[lx++] = (isascii(ch) && isprint(ch)) ? ch : '.';
}
nil: nil:
linebuf[lx++] = '\0'; linebuf[lx++] = '\0';
} }
@ -143,7 +144,7 @@ EXPORT_SYMBOL(hex_dump_to_buffer);
* *
* E.g.: * E.g.:
* print_hex_dump(KERN_DEBUG, "raw data: ", DUMP_PREFIX_ADDRESS, * print_hex_dump(KERN_DEBUG, "raw data: ", DUMP_PREFIX_ADDRESS,
* 16, 1, frame->data, frame->len, 1); * 16, 1, frame->data, frame->len, true);
* *
* Example output using %DUMP_PREFIX_OFFSET and 1-byte mode: * Example output using %DUMP_PREFIX_OFFSET and 1-byte mode:
* 0009ab42: 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f @ABCDEFGHIJKLMNO * 0009ab42: 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f @ABCDEFGHIJKLMNO
@ -151,12 +152,12 @@ EXPORT_SYMBOL(hex_dump_to_buffer);
* ffffffff88089af0: 73727170 77767574 7b7a7978 7f7e7d7c pqrstuvwxyz{|}~. * ffffffff88089af0: 73727170 77767574 7b7a7978 7f7e7d7c pqrstuvwxyz{|}~.
*/ */
void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, void print_hex_dump(const char *level, const char *prefix_str, int prefix_type,
int rowsize, int groupsize, int rowsize, int groupsize,
const void *buf, size_t len, bool ascii) const void *buf, size_t len, bool ascii)
{ {
const u8 *ptr = buf; const u8 *ptr = buf;
int i, linelen, remaining = len; int i, linelen, remaining = len;
unsigned char linebuf[200]; unsigned char linebuf[32 * 3 + 2 + 32 + 1];
if (rowsize != 16 && rowsize != 32) if (rowsize != 16 && rowsize != 32)
rowsize = 16; rowsize = 16;
@ -164,13 +165,14 @@ void print_hex_dump(const char *level, const char *prefix_str, int prefix_type,
for (i = 0; i < len; i += rowsize) { for (i = 0; i < len; i += rowsize) {
linelen = min(remaining, rowsize); linelen = min(remaining, rowsize);
remaining -= rowsize; remaining -= rowsize;
hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize, hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize,
linebuf, sizeof(linebuf), ascii); linebuf, sizeof(linebuf), ascii);
switch (prefix_type) { switch (prefix_type) {
case DUMP_PREFIX_ADDRESS: case DUMP_PREFIX_ADDRESS:
printk("%s%s%*p: %s\n", level, prefix_str, printk("%s%s%p: %s\n",
(int)(2 * sizeof(void *)), ptr + i, linebuf); level, prefix_str, ptr + i, linebuf);
break; break;
case DUMP_PREFIX_OFFSET: case DUMP_PREFIX_OFFSET:
printk("%s%s%.8x: %s\n", level, prefix_str, i, linebuf); printk("%s%s%.8x: %s\n", level, prefix_str, i, linebuf);
@ -196,9 +198,9 @@ EXPORT_SYMBOL(print_hex_dump);
* rowsize of 16, groupsize of 1, and ASCII output included. * rowsize of 16, groupsize of 1, and ASCII output included.
*/ */
void print_hex_dump_bytes(const char *prefix_str, int prefix_type, void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
const void *buf, size_t len) const void *buf, size_t len)
{ {
print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, 16, 1, print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, 16, 1,
buf, len, 1); buf, len, true);
} }
EXPORT_SYMBOL(print_hex_dump_bytes); EXPORT_SYMBOL(print_hex_dump_bytes);