diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-07 11:47:30 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-07 13:36:41 +0100 |
| commit | e2982e7f6f0b624a773ec5a58885ee80fab46d34 (patch) | |
| tree | 52c8e511ccaff8ef09dc3337b213273865522162 /print-vjc.c | |
| parent | 8ab5c3a4e75a3ce8da691cd6ca6a9945082827af (diff) | |
| download | tcpdump-e2982e7f6f0b624a773ec5a58885ee80fab46d34.tar.gz | |
Update ND_PRINT() as a variadic macro
Diffstat (limited to 'print-vjc.c')
| -rw-r--r-- | print-vjc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/print-vjc.c b/print-vjc.c index 0743cfa0..4a5fe9bd 100644 --- a/print-vjc.c +++ b/print-vjc.c @@ -91,31 +91,31 @@ vjc_print(netdissect_options *ndo, const u_char *bp, u_short proto _U_) switch (EXTRACT_U_1(bp) & 0xf0) { case TYPE_IP: if (ndo->ndo_eflag) - ND_PRINT((ndo, "(vjc type=IP) ")); + ND_PRINT("(vjc type=IP) "); return PPP_IP; case TYPE_UNCOMPRESSED_TCP: if (ndo->ndo_eflag) - ND_PRINT((ndo, "(vjc type=raw TCP) ")); + ND_PRINT("(vjc type=raw TCP) "); return PPP_IP; case TYPE_COMPRESSED_TCP: if (ndo->ndo_eflag) - ND_PRINT((ndo, "(vjc type=compressed TCP) ")); + ND_PRINT("(vjc type=compressed TCP) "); for (i = 0; i < 8; i++) { if (EXTRACT_U_1(bp + 1) & (0x80 >> i)) - ND_PRINT((ndo, "%c", "?CI?SAWU"[i])); + ND_PRINT("%c", "?CI?SAWU"[i]); } if (EXTRACT_U_1(bp + 1)) - ND_PRINT((ndo, " ")); - ND_PRINT((ndo, "C=0x%02x ", EXTRACT_U_1(bp + 2))); - ND_PRINT((ndo, "sum=0x%04x ", *(const u_short *)(bp + 3))); + ND_PRINT(" "); + ND_PRINT("C=0x%02x ", EXTRACT_U_1(bp + 2)); + ND_PRINT("sum=0x%04x ", *(const u_short *)(bp + 3)); return -1; case TYPE_ERROR: if (ndo->ndo_eflag) - ND_PRINT((ndo, "(vjc type=error) ")); + ND_PRINT("(vjc type=error) "); return -1; default: if (ndo->ndo_eflag) - ND_PRINT((ndo, "(vjc type=0x%02x) ", EXTRACT_U_1(bp) & 0xf0)); + ND_PRINT("(vjc type=0x%02x) ", EXTRACT_U_1(bp) & 0xf0); return -1; } } |