sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate a couple of 3-line functions that barely wrap *printf calls

Browse Source 
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6309 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
2011-01-28 07:41:10 +00:00
committed by Patrick Georgi
parent bf64985e3b
commit c7ca3e5ca4
2 changed files with 9 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
util/nvramtool/hexdump.c
View File

@@ -3,6 +3,7 @@
\*****************************************************************************/
#include "hexdump.h"
#include <ctype.h>
/* hexdump.c
*
@@ -44,9 +45,6 @@
*/
static void addrprint(FILE * outfile, uint64_t address, int width);
static void hexprint(FILE * outfile, unsigned char byte);
static void charprint(FILE * outfile, unsigned char byte,
unsigned char nonprintable);
/*--------------------------------------------------------------------------
* hexdump
@@ -92,7 +90,7 @@ void hexdump(const void *mem, int bytes, uint64_t addrprint_start,
/* display the bytes in hex */
for (i = 0;;) {
hexprint(outfile, p[index++]);
fprintf(outfile, "%02x", p[index++]);
if (++i >= format->bytes_per_line)
break;
@@ -104,8 +102,8 @@ void hexdump(const void *mem, int bytes, uint64_t addrprint_start,
fprintf(outfile, format->sep3);
/* display the bytes as characters */
for (i = 0; i < format->bytes_per_line; i++)
charprint(outfile, p[index++], format->nonprintable);
for (i = 0; i < format->bytes_per_line; i++, index++)
fputc(isprint(p[index])?p[index]:format->nonprintable, outfile);
fprintf(outfile, "\n");
}
@@ -120,7 +118,7 @@ void hexdump(const void *mem, int bytes, uint64_t addrprint_start,
/* display bytes for last line in hex */
for (i = 0; i < bytes_left; i++) {
hexprint(outfile, p[index++]);
fprintf(outfile, "%02x", p[index++]);
fprintf(outfile, format->sep2);
}
@@ -140,7 +138,7 @@ void hexdump(const void *mem, int bytes, uint64_t addrprint_start,
/* display bytes for last line as characters */
for (i = 0; i < bytes_left; i++)
charprint(outfile, p[index++], format->nonprintable);
fputc(isprint(p[index])?p[index++]:format->nonprintable, outfile);
/* pad the rest of the character area with spaces */
for (; i < format->bytes_per_line; i++)
@@ -188,38 +186,3 @@ static void addrprint(FILE * outfile, uint64_t address, int width)
}
}
/*--------------------------------------------------------------------------
* hexprint
*
* Display a byte as a two digit hex value.
*
* parameters:
* outfile: the place where the output should be written
* byte: the byte to display
*--------------------------------------------------------------------------*/
static void hexprint(FILE * outfile, unsigned char byte)
{
static const char tbl[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
fprintf(outfile, "%c%c", tbl[byte >> 4], tbl[byte & 0x0f]);
}
/*--------------------------------------------------------------------------
* charprint
*
* Display a byte as its character representation.
*
* parameters:
* outfile: the place where the output should be written
* byte: the byte to display
* nonprintable: a substitute character to display if the byte
* represents a nonprintable character
*--------------------------------------------------------------------------*/
static void charprint(FILE * outfile, unsigned char byte,
unsigned char nonprintable)
{
fprintf(outfile, "%c", ((byte >= 0x20) && (byte <= 0x7e)) ? byte : nonprintable);
}