summaryrefslogtreecommitdiff
path: root/tcpdump.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-08-08 22:39:54 -0700
committerGuy Harris <guy@alum.mit.edu>2019-08-08 23:21:35 -0700
commit1ed63b5d0630a4b5b4a8d31174d9f3e95a970913 (patch)
tree47373d65dd7495380858f848fda5368d1dcb180c /tcpdump.c
parentdfcccf43766e22aec8793b0a3f963d5ec5a52b80 (diff)
downloadtcpdump-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 'tcpdump.c')
-rw-r--r--tcpdump.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tcpdump.c b/tcpdump.c
index e8394c0b..b0779a7c 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -844,7 +844,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
if (cnt == 0 && max_chars == 0)
strncpy(buffer, filename, PATH_MAX + 1);
else
- if (nd_snprintf(buffer, PATH_MAX + 1, "%s%0*d", filename, max_chars, cnt) > PATH_MAX)
+ if (snprintf(buffer, PATH_MAX + 1, "%s%0*d", filename, max_chars, cnt) > PATH_MAX)
/* Report an error if the filename is too large */
error("too many output files or filename is too long (> %d)", PATH_MAX);
free(filename);
@@ -1343,7 +1343,7 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
/*
* Return an error for our caller to handle.
*/
- nd_snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s: %s\n(%s)",
+ snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s: %s\n(%s)",
device, pcap_statustostr(status), cp);
pcap_close(pc);
return (NULL);
@@ -1357,7 +1357,7 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
char sysctl[32];
size_t s = sizeof(parent);
- nd_snprintf(sysctl, sizeof(sysctl),
+ snprintf(sysctl, sizeof(sysctl),
"net.wlan.%d.%%parent", atoi(device + 4));
sysctlbyname(sysctl, parent, &s, NULL, 0);
strlcpy(newdev, device, sizeof(newdev));