Correctly set the "short GI" flag in the generic radio information structure.

[metze/wireshark/wip.git] / capinfos.c

diff --git a/capinfos.c b/capinfos.c
index 73bdf35f22213350786b5fedc6f9d8f1e0376e1c..5a3e2b3f5626ab82d70db148369578eb03db4284 100644 (file)
--- a/capinfos.c
+++ b/capinfos.c
@@ -63,10 +63,6 @@
 #include <locale.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@@ -77,6 +73,8 @@
 #include <zlib.h>     /* to get the libz version number */
 #endif
 
+#include <wiretap/wtap.h>
+
 #include <wsutil/crash_info.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
@@ -87,7 +85,6 @@
 #include <wsutil/plugins.h>
 #endif
 
-#include "wtap.h"
 #include <wsutil/report_err.h>
 #include <wsutil/str_util.h>
 #include <wsutil/file_util.h>
@@ -1398,13 +1395,11 @@ main(int argc, char *argv[])
   gchar *err_info;
   int    opt;
   int    overall_error_status;
-DIAG_OFF(cast-qual)
   static const struct option long_options[] = {
-      {(char *)"help", no_argument, NULL, 'h'},
-      {(char *)"version", no_argument, NULL, 'v'},
+      {"help", no_argument, NULL, 'h'},
+      {"version", no_argument, NULL, 'v'},
       {0, 0, 0, 0 }
   };
-DIAG_ON(cast-qual)
 
   int status = 0;
 #ifdef HAVE_PLUGINS
@@ -1446,7 +1441,7 @@ DIAG_ON(cast-qual)
   init_open_routines();
 
 #ifdef HAVE_PLUGINS
-  if ((init_progfile_dir_error = init_progfile_dir(argv[0], (void *)main))) {
+  if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
     g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
     g_free(init_progfile_dir_error);
   } else {
@@ -1621,7 +1616,7 @@ DIAG_ON(cast-qual)
       case 'h':
         printf("Capinfos (Wireshark) %s\n"
                "Print various information (infos) about capture files.\n"
-               "See http://www.wireshark.org for more information.\n",
+               "See https://www.wireshark.org for more information.\n",
                get_ws_vcs_version_info());
         print_usage(stdout);
         exit(0);