RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-03 03:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tools: make debug_hexdump() take a string prefix

Browse Source 
When dumping data at various places in the code, it's hard to figure
what is present where. To make this easier, this patch slightly modifies
debug_hexdump() to take a prefix string which is prepended in front of
each output line.
This commit is contained in:
Willy Tarreau 2017-04-27 18:03:20 +02:00
parent 9faef1e391
commit ed936c5d37
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/common/standard.h
View File

@ -1079,9 +1079,10 @@ char *env_expand(char *in);
#define fddebug(msg...) do { char *_m = NULL; memprintf(&_m, ##msg); if (_m) write(-1, _m, strlen(_m)); free(_m); } while (0)
/* displays a <len> long memory block at <buf>, assuming first byte of <buf>
* has address <baseaddr>. The output is emitted to file <out>.
* has address <baseaddr>. String <pfx> may be placed as a prefix in front of
* each line. It may be NULL if unused. The output is emitted to file <out>.
*/
void debug_hexdump(FILE *out, const char *buf, unsigned int baseaddr, int len);
void debug_hexdump(FILE *out, const char *pfx, const char *buf, unsigned int baseaddr, int len);
/* used from everywhere just to drain results we don't want to read and which
* recent versions of gcc increasingly and annoyingly complain about.

8
src/standard.c
View File

@ -3780,16 +3780,18 @@ int dump_text_line(struct chunk *out, const char *buf, int bsize, int len,
}
/* displays a <len> long memory block at <buf>, assuming first byte of <buf>
* has address <baseaddr>. The output is emitted to file <out>.
* has address <baseaddr>. String <pfx> may be placed as a prefix in front of
* each line. It may be NULL if unused. The output is emitted to file <out>.
*/
void debug_hexdump(FILE *out, const char *buf, unsigned int baseaddr, int len)
void debug_hexdump(FILE *out, const char *pfx, const char *buf,
unsigned int baseaddr, int len)
{
unsigned int i;
int b, j;
for (i = 0; i < (len + (baseaddr & 15)); i += 16) {
b = i - (baseaddr & 15);
fprintf(out, "%08x: ", i + (baseaddr & ~15));
fprintf(out, "%s%08x: ", pfx ? pfx : "", i + (baseaddr & ~15));
for (j = 0; j < 8; j++) {
if (b + j >= 0 && b + j < len)
fprintf(out, "%02x ", (unsigned char)buf[b + j]);