diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-13 11:06:15 +0400 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-13 11:06:15 +0400 |
| commit | eb8916857ce311840b64bcec0baae15829b0b810 (patch) | |
| tree | afe9b35d9c42244d510ee969daccbd9ec712d361 /print-ascii.c | |
| parent | ce1fc8263da72437c1df54b8b3ee682413d9e6ed (diff) | |
| download | tcpdump-eb8916857ce311840b64bcec0baae15829b0b810.tar.gz | |
NDOize print-ascii.c further
Introduce netdissect_options into hex_and_ascii_print_with_offset(),
hex_and_ascii_print() and related functions.
Diffstat (limited to 'print-ascii.c')
| -rw-r--r-- | print-ascii.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/print-ascii.c b/print-ascii.c index 18d5d0fb..55e0ae72 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -85,7 +85,7 @@ ascii_print(register const u_char *cp, register u_int length) } void -hex_and_ascii_print_with_offset(register const char *ident, +hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident, register const u_char *cp, register u_int length, register u_int oset) { register u_int i; @@ -108,9 +108,9 @@ hex_and_ascii_print_with_offset(register const char *ident, i++; if (i >= HEXDUMP_SHORTS_PER_LINE) { *hsp = *asp = '\0'; - (void)printf("%s0x%04x: %-*s %s", + ND_PRINT((ndo, "%s0x%04x: %-*s %s", ident, oset, HEXDUMP_HEXSTUFF_PER_LINE, - hexstuff, asciistuff); + hexstuff, asciistuff)); i = 0; hsp = hexstuff; asp = asciistuff; oset += HEXDUMP_BYTES_PER_LINE; } @@ -125,17 +125,17 @@ hex_and_ascii_print_with_offset(register const char *ident, } if (i > 0) { *hsp = *asp = '\0'; - (void)printf("%s0x%04x: %-*s %s", + ND_PRINT((ndo, "%s0x%04x: %-*s %s", ident, oset, HEXDUMP_HEXSTUFF_PER_LINE, - hexstuff, asciistuff); + hexstuff, asciistuff)); } } void -hex_and_ascii_print(register const char *ident, register const u_char *cp, - register u_int length) +hex_and_ascii_print(netdissect_options *ndo, register const char *ident, + register const u_char *cp, register u_int length) { - hex_and_ascii_print_with_offset(ident, cp, length, 0); + hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0); } /* |