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>
---
 reordercap.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'reordercap.c')

diff --git a/reordercap.c b/reordercap.c
index 1dcac3d4a6..4c64033926 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -46,8 +46,9 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
-#include <wsutil/file_util.h>
 #include <wsutil/crash_info.h>
+#include <wsutil/file_util.h>
+#include <wsutil/ws_diag_control.h>
 #include <wsutil/ws_version_info.h>
 
 /* Show command-line usage */
@@ -197,11 +198,13 @@ main(int argc, char *argv[])
     FrameRecord_t *prevFrame = NULL;
 
     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)
     int file_count;
     char *infile;
     char *outfile;
-- 
cgit v1.2.3