aboutsummaryrefslogtreecommitdiffstats
path: root/tfshark.c
diff options
context:
space:
mode:
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 /tfshark.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 'tfshark.c')
-rw-r--r--tfshark.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tfshark.c b/tfshark.c
index d87f6e3aba..ddf9e6695a 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -64,10 +64,11 @@
#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h>
-#include <wsutil/privileges.h>
-#include <wsutil/file_util.h>
#include <wsutil/filesystem.h>
+#include <wsutil/file_util.h>
+#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
+#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>
#include "globals.h"
@@ -772,11 +773,13 @@ main(int argc, char *argv[])
GString *runtime_info_str;
char *init_progfile_dir_error;
int opt;
+DIAG_OFF(cast-qual)
static const struct option long_options[] = {
{(char *)"help", no_argument, NULL, 'h'},
{(char *)"version", no_argument, NULL, 'v'},
{0, 0, 0, 0 }
};
+DIAG_ON(cast-qual)
gboolean arg_error = FALSE;
char *gpf_path, *pf_path;