aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-08-18 20:11:47 +0100
committerJoão Valverde <j@v6e.pt>2017-09-19 10:06:07 +0000
commit8615e78630e8deace183d150e2c1e5fc60d561ba (patch)
treeabf76c1f31bb8e593c9c38c20615a302c9b197fe
parentdd5875c487dea7e75b3653485d153c0dab909699 (diff)
Disable flex-generated [-Wsign-compare] warnings
Change-Id: Iace0462e6bb50573f3e4603f7a19e4b7ee1f9733 Reviewed-on: https://code.wireshark.org/review/23541 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--epan/dfilter/scanner.l4
-rw-r--r--epan/diam_dict.l4
-rw-r--r--epan/dtd_parse.l4
-rw-r--r--epan/dtd_preparse.l4
-rw-r--r--epan/radius_dict.l4
-rw-r--r--epan/uat_load.l5
-rw-r--r--plugins/mate/mate_parser.l4
-rw-r--r--plugins/wimaxasncp/wimaxasncp_dict.l4
-rw-r--r--text2pcap-scanner.l2
-rw-r--r--ui/text_import_scanner.l2
-rw-r--r--wiretap/ascend_scanner.l2
-rw-r--r--wiretap/k12text.l4
12 files changed, 41 insertions, 2 deletions
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index 8f5f96a25d..5f1d29df4a 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -81,6 +81,8 @@
#include "grammar.h"
#include "dfunctions.h"
+DIAG_OFF(sign-compare)
+
#ifdef _WIN32
/* disable Windows VC compiler warning "signed/unsigned mismatch" associated */
/* with YY_INPUT code generated by flex versions such as 2.5.35. */
@@ -383,6 +385,8 @@ static void mark_lval_deprecated(const char *s);
%%
+DIAG_ON(sign-compare)
+
static int
simple(int token)
{
diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index f29b50a75e..1ea330f300 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -100,6 +100,8 @@
#include <epan/to_str.h>
#include <wsutil/file_util.h>
+DIAG_OFF(sign-compare)
+
typedef struct entity_t {
char* name;
char* file;
@@ -625,6 +627,8 @@ description_attr description=\042
%%
+DIAG_ON(sign-compare)
+
static int debugging = 0;
static void ddict_debug(const char* fmt, ...) {
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index 1c8434f5fb..37f3bcf5c4 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -88,6 +88,8 @@
#include "dtd_grammar.h"
#include "dtd_parse.h"
+DIAG_OFF(sign-compare)
+
struct _proto_xmlpi_attr {
const gchar* name;
void (*act)(gchar*);
@@ -344,6 +346,8 @@ squoted ['][^\']*[']
%%
+DIAG_ON(sign-compare)
+
static dtd_token_data_t* new_token(gchar* text, gchar* location) {
dtd_token_data_t* t = g_new(dtd_token_data_t,1);
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index a3d169849f..d28137cb3a 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -97,6 +97,8 @@
#include "dtd.h"
#include <wsutil/file_util.h>
+DIAG_OFF(sign-compare)
+
#define ECHO g_string_append(yyextra->current,yytext);
struct _dtd_preparse_scanner_state {
@@ -210,6 +212,8 @@ newline \n
%%
+DIAG_ON(sign-compare)
+
static const gchar* replace_entity(Dtd_PreParse_scanner_state_t* state, gchar* entity) {
GString* replacement;
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 3652c7f845..e2dd13fd84 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -92,6 +92,8 @@
#include <epan/dissectors/packet-radius.h>
#include <wsutil/file_util.h>
+DIAG_OFF(sign-compare)
+
/*
* See
*
@@ -410,6 +412,8 @@ static void add_value(Radius_scanner_state_t* state, const gchar* attrib_name, c
%%
+DIAG_ON(sign-compare)
+
static void add_vendor(Radius_scanner_state_t* state, const gchar* name, guint32 id, guint type_octets, guint length_octets, gboolean has_flags) {
radius_vendor_info_t* v;
diff --git a/epan/uat_load.l b/epan/uat_load.l
index 8c8af5452f..3c62f4d77e 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -90,6 +90,8 @@
#include "uat-int.h"
#include <wsutil/file_util.h>
+DIAG_OFF(sign-compare)
+
#ifdef _WIN32
/* disable Windows VC compiler warning "signed/unsigned mismatch" associated */
/* with YY_INPUT code generated by flex versions such as 2.5.35. */
@@ -352,8 +354,7 @@ comment #[^\n]*\n
%%
-
-
+DIAG_ON(sign-compare)
gboolean
uat_load(uat_t *uat, char **errx)
diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index b266b4061a..b2ff7117cc 100644
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -84,6 +84,8 @@
#include <wsutil/file_util.h>
+DIAG_OFF(sign-compare)
+
#ifdef _WIN32
/* disable Windows VC compiler warning "signed/unsigned mismatch" associated */
/* with YY_INPUT code generated by flex versions such as 2.5.35. */
@@ -335,6 +337,8 @@ blk_cmnt_stop "*/"
%%
+DIAG_ON(sign-compare)
+
extern gboolean mate_load_config(const gchar* filename, mate_config* mc) {
FILE *in;
yyscan_t scanner;
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l
index 7e4db0b8fd..7283b0ec43 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.l
+++ b/plugins/wimaxasncp/wimaxasncp_dict.l
@@ -100,6 +100,8 @@
#include "wimaxasncp_dict.h"
+DIAG_OFF(sign-compare)
+
typedef struct entity_t {
gchar *name;
gchar *file;
@@ -521,6 +523,8 @@ since_attr since=\042
%%
+DIAG_ON(sign-compare)
+
static int debugging = 0;
static void wimaxasncp_dict_debug(const gchar *fmt, ...) {
diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index f422bca69a..2b9e6dbab8 100644
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -66,6 +66,8 @@
#include "text2pcap.h"
+DIAG_OFF(sign-compare)
+
/*
* Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
*/
diff --git a/ui/text_import_scanner.l b/ui/text_import_scanner.l
index 5182b7fe8e..04809fc459 100644
--- a/ui/text_import_scanner.l
+++ b/ui/text_import_scanner.l
@@ -84,6 +84,8 @@
#include "text_import_scanner.h"
+DIAG_OFF(sign-compare)
+
/*
* Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
*/
diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l
index 8eb37fd08f..e182b243d1 100644
--- a/wiretap/ascend_scanner.l
+++ b/wiretap/ascend_scanner.l
@@ -78,6 +78,8 @@
#include "ascend.h"
#include "file_wrappers.h"
+DIAG_OFF(sign-compare)
+
#define YY_INPUT(buf,result,max_size) { \
ascend_state_t *parser_state = ascendget_extra(yyscanner); \
int c = file_getc(parser_state->fh); \
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index 36bfa3a111..fd4425bd00 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -114,6 +114,8 @@
#define YY_NO_UNISTD_H
#endif
+DIAG_OFF(sign-compare)
+
/*
* State kept by the scanner.
*/
@@ -244,6 +246,8 @@ hdlc HDLC
%%
+DIAG_ON(sign-compare)
+
/* Fill in pkthdr */
static gboolean