Clean up whitespaces

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 32075b51ade51b208048cd470d300028a2f7fcf3..3b4d84f9ae85e6ad7ebc59d108e4971d5c63be0a 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -985,7 +985,7 @@ static char *
 copy_argv(char **argv)
 {
        char **p;
-       u_int len = 0;
+       size_t len = 0;
        char *buf;
        char *src, *dst;
 
@@ -1156,6 +1156,9 @@ _U_
                 */
                endp++; /* Include the trailing / in the URL; pcap_findalldevs_ex() requires it */
                host_url = malloc(endp - url + 1);
+               if (host_url == NULL && (endp - url + 1) > 0)
+                       error("Invalid allocation for host");
+
                memcpy(host_url, url, endp - url);
                host_url[endp - url] = '\0';
                status = pcap_findalldevs_ex(host_url, NULL, &devlist, ebuf);
@@ -1974,15 +1977,14 @@ main(int argc, char **argv)
 #endif
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);
+               fprintf(stderr, "reading from file %s", RFileName);
                if (dlt_name == NULL) {
-                       fprintf(stderr, "reading from file %s, link-type %u\n",
-                           RFileName, dlt);
+                       fprintf(stderr, ", link-type %u", dlt);
                } else {
-                       fprintf(stderr,
-                           "reading from file %s, link-type %s (%s)\n",
-                           RFileName, dlt_name,
-                           pcap_datalink_val_to_description(dlt));
+                       fprintf(stderr, ", link-type %s (%s)", dlt_name,
+                               pcap_datalink_val_to_description(dlt));
                }
+               fprintf(stderr, ", snapshot length %d\n", pcap_snapshot(pd));
 #ifdef DLT_LINUX_SLL2
                if (dlt == DLT_LINUX_SLL2)
                        fprintf(stderr, "Warning: interface names might be incorrect\n");
@@ -2379,14 +2381,14 @@ DIAG_ON_CLANG(assign-enum)
                        (void)fprintf(stderr, "%s: ", program_name);
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);
+               (void)fprintf(stderr, "listening on %s", device);
                if (dlt_name == NULL) {
-                       (void)fprintf(stderr, "listening on %s, link-type %u, capture size %u bytes\n",
-                           device, dlt, ndo->ndo_snaplen);
+                       (void)fprintf(stderr, ", link-type %u", dlt);
                } else {
-                       (void)fprintf(stderr, "listening on %s, link-type %s (%s), capture size %u bytes\n",
-                           device, dlt_name,
-                           pcap_datalink_val_to_description(dlt), ndo->ndo_snaplen);
+                       (void)fprintf(stderr, ", link-type %s (%s)", dlt_name,
+                                     pcap_datalink_val_to_description(dlt));
                }
+               (void)fprintf(stderr, ", snapshot length %d bytes\n", ndo->ndo_snaplen);
                (void)fflush(stderr);
        }
 
@@ -2502,15 +2504,15 @@ DIAG_ON_CLANG(assign-enum)
                                 * Report the new file.
                                 */
                                dlt_name = pcap_datalink_val_to_name(dlt);
+                               fprintf(stderr, "reading from file %s", RFileName);
                                if (dlt_name == NULL) {
-                                       fprintf(stderr, "reading from file %s, link-type %u\n",
-                                           RFileName, dlt);
+                                       fprintf(stderr, ", link-type %u", dlt);
                                } else {
-                                       fprintf(stderr,
-                                       "reading from file %s, link-type %s (%s)\n",
-                                           RFileName, dlt_name,
-                                           pcap_datalink_val_to_description(dlt));
+                                       fprintf(stderr, ", link-type %s (%s)",
+                                               dlt_name,
+                                               pcap_datalink_val_to_description(dlt));
                                }
+                               fprintf(stderr, ", snapshot length %d\n", pcap_snapshot(pd));
                        }
                }
        }