Compile with '-Wsign-compare' in devel mode if supported

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 659a09033b557d3637ee23e40bd3d92fae56b52a..d17a572b4d8733f5f0cc301c9d40c96c8da78806 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -624,6 +624,10 @@ show_remote_devices_and_exit(void)
 #define J_FLAG
 #endif /* PCAP_ERROR_TSTAMP_TYPE_NOTSUP */
 
+#ifdef USE_LIBSMI
+#define m_FLAG_USAGE "[ -m module ] ..."
+#endif
+
 #ifdef HAVE_PCAP_SETDIRECTION
 #define Q_FLAG "Q:"
 #define Q_FLAG_USAGE " [ -Q in|out|inout ]"
@@ -713,7 +717,7 @@ static const struct option longopts[] = {
 };
 
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
-#define LIST_REMOTE_INTERFACES_USAGE "[ --list-remote-interfaces remote-source  ]"
+#define LIST_REMOTE_INTERFACES_USAGE "[ --list-remote-interfaces remote-source ]"
 #else
 #define LIST_REMOTE_INTERFACES_USAGE
 #endif
@@ -1156,6 +1160,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);
@@ -2378,14 +2385,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 %d 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 %d 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);
        }
 
@@ -3056,6 +3063,10 @@ print_usage(void)
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
        (void)fprintf(stderr,
 "\t\t" LIST_REMOTE_INTERFACES_USAGE "\n");
+#endif
+#ifdef USE_LIBSMI
+       (void)fprintf(stderr,
+"\t\t" m_FLAG_USAGE "\n");
 #endif
        (void)fprintf(stderr,
 "\t\t[ -M secret ] [ --number ] [ --print ]" Q_FLAG_USAGE "\n");