diff options
| author | hannes <hannes> | 2003-12-29 11:05:09 +0000 |
|---|---|---|
| committer | hannes <hannes> | 2003-12-29 11:05:09 +0000 |
| commit | 60263ffef678ebb7d0d139a8c4d06446c2ea15f4 (patch) | |
| tree | c29e167244d4e9753c17a449edfee1d067e13761 /print-ascii.c | |
| parent | 5c739aff6361f9d637ddb6338f2314de4eb5ea56 (diff) | |
| download | tcpdump-60263ffef678ebb7d0d139a8c4d06446c2ea15f4.tar.gz | |
pass on ident string to hex_print()
Diffstat (limited to 'print-ascii.c')
| -rw-r--r-- | print-ascii.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-ascii.c b/print-ascii.c index 9d0f278f..78297c44 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -42,7 +42,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.14 2003-12-29 10:51:34 hannes Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.15 2003-12-29 11:05:10 hannes Exp $"; #endif #include <tcpdump-stdinc.h> #include <stdio.h> @@ -135,7 +135,7 @@ ascii_print(register const u_char *ident, register const u_char *cp, register u_ * telnet_print() wants this. It is essentially default_print_unaligned() */ void -hex_print_with_offset(register const u_char *cp, register u_int length, +hex_print_with_offset(register const u_char *ident, register const u_char *cp, register u_int length, register u_int oset) { register u_int i, s; @@ -145,7 +145,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length, i = 0; while (--nshorts >= 0) { if ((i++ % 8) == 0) { - (void)printf("\n0x%04x\t", oset); + (void)printf("%s0x%04x: ", ident, oset); oset += HEXDUMP_BYTES_PER_LINE; } s = *cp++; @@ -153,7 +153,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length, } if (length & 1) { if ((i % 8) == 0) - (void)printf("\n0x%04x\t", oset); + (void)printf("%s0x%04x: ", ident, oset); (void)printf(" %02x", *cp); } } @@ -162,9 +162,9 @@ hex_print_with_offset(register const u_char *cp, register u_int length, * just for completeness */ void -hex_print(register const u_char *cp, register u_int length) +hex_print(register const u_char *ident, register const u_char *cp, register u_int length) { - hex_print_with_offset(cp, length, 0); + hex_print_with_offset(ident, cp, length, 0); } #ifdef MAIN |