path: root/mergecap.c
diff options
authorGerald Combs <gerald@wireshark.org>2015-02-19 16:05:49 -0800
committerGerald Combs <gerald@wireshark.org>2015-02-20 04:04:15 +0000
commit95382c3afb9d50ffc7c0d178dbe9d76c763d687c (patch)
treeeee8a98844328b7ed7bc84b9156bcf3949d97903 /mergecap.c
parent9423a13b2db427d15f6b3d11b73624fffc02608f (diff)
Suppress a bunch of cast-qual warnings.
Squelch warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual] similar to g630f54f. Change strtod to g_ascii_strtod to squelch a checkAPIs error. Change-Id: Ib2d26ef89f08827a5adc07e35eaf876cd7b8d14e Reviewed-on: https://code.wireshark.org/review/7269 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'mergecap.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c
index 3f345be9d4..5446fc6584 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -54,10 +54,11 @@
#include <wsutil/clopts_common.h>
-#include <wsutil/strnatcmp.h>
-#include <wsutil/file_util.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h>
+#include <wsutil/file_util.h>
+#include <wsutil/strnatcmp.h>
+#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include <wiretap/merge.h>
@@ -215,11 +216,13 @@ main(int argc, char *argv[])
GString *comp_info_str;
GString *runtime_info_str;
int opt;
static const struct option long_options[] = {
{(char *)"help", no_argument, NULL, 'h'},
{(char *)"version", no_argument, NULL, 'V'},
{0, 0, 0, 0 }
gboolean do_append = FALSE;
gboolean verbose = FALSE;
int in_file_count = 0;