From 95382c3afb9d50ffc7c0d178dbe9d76c763d687c Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 19 Feb 2015 16:05:49 -0800
Subject: Suppress a bunch of cast-qual warnings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 capinfos.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'capinfos.c')

diff --git a/capinfos.c b/capinfos.c
index 555dfff312..31a6fb32ff 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -81,9 +81,10 @@
 #include <zlib.h>     /* to get the libz version number */
 #endif
 
-#include <wsutil/privileges.h>
-#include <wsutil/filesystem.h>
 #include <wsutil/crash_info.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/privileges.h>
+#include <wsutil/ws_diag_control.h>
 #include <wsutil/ws_version_info.h>
 
 #ifdef HAVE_PLUGINS
@@ -1118,11 +1119,13 @@ 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'},
       {0, 0, 0, 0 }
   };
+DIAG_ON(cast-qual)
 
   int status = 0;
 #ifdef HAVE_PLUGINS
-- 
cgit v1.2.1