diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-08-08 22:39:54 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-08-08 23:21:35 -0700 |
| commit | 1ed63b5d0630a4b5b4a8d31174d9f3e95a970913 (patch) | |
| tree | 47373d65dd7495380858f848fda5368d1dcb180c /print-hncp.c | |
| parent | dfcccf43766e22aec8793b0a3f963d5ec5a52b80 (diff) | |
| download | tcpdump-1ed63b5d0630a4b5b4a8d31174d9f3e95a970913.tar.gz | |
Remove more old-compiler compensation.
We require an environment with a C99-compatible snprintf(), so we don't
need to work around older implementations. Make the configuration
process fail if we don't have snprintf() and vsnprintf().
We require at least VS 2015, so we don't have to check for _MSC_VER >=
1400. Make the build fail if we don't have at least VS 2015.
We apparently do, however, have to use __inline, as the VS 2015
documentation doesn't meaning plain old "inline". Update a comment.
Diffstat (limited to 'print-hncp.c')
| -rw-r--r-- | print-hncp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-hncp.c b/print-hncp.c index 60a7ca9b..0593b65b 100644 --- a/print-hncp.c +++ b/print-hncp.c @@ -162,7 +162,7 @@ format_nid(netdissect_options *ndo, const u_char *data) static char buf[4][sizeof("01:01:01:01")]; static int i = 0; i = (i + 1) % 4; - nd_snprintf(buf[i], sizeof(buf[i]), "%02x:%02x:%02x:%02x", + snprintf(buf[i], sizeof(buf[i]), "%02x:%02x:%02x:%02x", GET_U_1(data), GET_U_1(data + 1), GET_U_1(data + 2), GET_U_1(data + 3)); return buf[i]; @@ -174,7 +174,7 @@ format_256(netdissect_options *ndo, const u_char *data) static char buf[4][sizeof("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")]; static int i = 0; i = (i + 1) % 4; - nd_snprintf(buf[i], sizeof(buf[i]), "%016" PRIx64 "%016" PRIx64 "%016" PRIx64 "%016" PRIx64, + snprintf(buf[i], sizeof(buf[i]), "%016" PRIx64 "%016" PRIx64 "%016" PRIx64 "%016" PRIx64, GET_BE_U_8(data), GET_BE_U_8(data + 8), GET_BE_U_8(data + 16), @@ -189,7 +189,7 @@ format_interval(const uint32_t n) static char buf[4][sizeof("0000000.000s")]; static int i = 0; i = (i + 1) % 4; - nd_snprintf(buf[i], sizeof(buf[i]), "%u.%03us", n / 1000, n % 1000); + snprintf(buf[i], sizeof(buf[i]), "%u.%03us", n / 1000, n % 1000); return buf[i]; } @@ -227,7 +227,7 @@ print_prefix(netdissect_options *ndo, const u_char *prefix, u_int max_length) ((u_char *)&addr)[plenbytes - 1] &= ((0xff00 >> (plen % 8)) & 0xff); } - nd_snprintf(buf, sizeof(buf), "%s/%u", ipaddr_string(ndo, (const u_char *)&addr), plen); + snprintf(buf, sizeof(buf), "%s/%u", ipaddr_string(ndo, (const u_char *)&addr), plen); plenbytes += 1 + IPV4_MAPPED_HEADING_LEN; } else { plenbytes = decode_prefix6(ndo, prefix, max_length, buf, sizeof(buf)); |