Make 1-element arrays for fields that may repeat.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 9fd0393f2a21a0d74253cf70410a5f802750251f..84f30f2d41c570694fc194551735f635fc4e57aa 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -97,7 +97,9 @@ The Regents of the University of California.  All rights reserved.\n";
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
@@ -225,7 +227,7 @@ void requestinfo(int);
 #endif
 
 #ifdef _WIN32
-    static HANDLE timer_handle = INVALID_HANDLE;
+    static HANDLE timer_handle = INVALID_HANDLE_VALUE;
     static void CALLBACK verbose_stats_dump(PVOID param, BOOLEAN timer_fired);
 #else /* _WIN32 */
   static void verbose_stats_dump(int sig);
@@ -927,10 +929,10 @@ set_dumper_capsicum_rights(pcap_dumper_t *p)
  * Copy arg vector into a new buffer, concatenating arguments with spaces.
  */
 static char *
-copy_argv(register char **argv)
+copy_argv(char **argv)
 {
-       register char **p;
-       register u_int len = 0;
+       char **p;
+       u_int len = 0;
        char *buf;
        char *src, *dst;
 
@@ -970,8 +972,8 @@ copy_argv(register char **argv)
 static char *
 read_infile(char *fname)
 {
-       register int i, fd, cc;
-       register char *cp;
+       int i, fd, cc;
+       char *cp;
        struct stat buf;
 
        fd = open(fname, O_RDONLY|O_BINARY);
@@ -1280,10 +1282,10 @@ fprintf(stderr, "Opening %s\n", device);
 int
 main(int argc, char **argv)
 {
-       register int cnt, op, i;
+       int cnt, op, i;
        bpf_u_int32 localnet = 0, netmask = 0;
        int timezone_offset = 0;
-       register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
+       char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        char *endp;
        pcap_handler callback;
        int dlt;
@@ -2212,7 +2214,7 @@ DIAG_ON_CLANG(assign-enum)
                 * that printing the stats could be a "long wait".
                 */
                CreateTimerQueueTimer(&timer_handle, NULL,
-                   verbose_stats_dump, NULL, 1000, 1000
+                   verbose_stats_dump, NULL, 1000, 1000,
                    WT_EXECUTEDEFAULT|WT_EXECUTELONGFUNCTION);
                setvbuf(stderr, NULL, _IONBF, 0);
 #else /* _WIN32 */
@@ -2412,10 +2414,10 @@ static void
 cleanup(int signo _U_)
 {
 #ifdef _WIN32
-       if (timer_handle != INVALID_HANDLE) {
+       if (timer_handle != INVALID_HANDLE_VALUE) {
                DeleteTimerQueueTimer(NULL, timer_handle, NULL);
                CloseHandle(timer_handle);
-               timer_handle = INVALID_HANDLE;
+               timer_handle = INVALID_HANDLE_VALUE;
         }
 #else /* _WIN32 */
        struct itimerval timer;
@@ -2469,7 +2471,7 @@ child_cleanup(int signo _U_)
 #endif /* HAVE_FORK && HAVE_VFORK */
 
 static void
-info(register int verbose)
+info(int verbose)
 {
        struct pcap_stat stats;