diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-16 03:15:32 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-02-16 19:54:16 +0000 |
| commit | 72b57ac4ef653c1909e4c1d1daf40de2357b77e8 (patch) | |
| tree | 991ac5b78097abb80d1b83272fc247e601e0edf4 /wiretap | |
| parent | 09671923adcb745381fc4b276085d0ac7cb8ee94 (diff) | |
Use DIAG_OFF_FLEX/DIAG_ON_FLEX more consistently.
Add warning C4267 (size_t to int conversion) with MSVC to DIAG_OFF_FLEX.
Addd -Wshorten-64-to-32 with Clang and GCC to DIAG_OFF_FLEX.
Don't explicitly use #pragma to turn off warnings; use DIAG_OFF_FLEX for
all of them.
If we use DIAG_OFF_FLEX, use DIAG_ON_FLEX, even if we have no section of
entirely included code at the end.
Change-Id: Ibfd44e8954704e9a8bcb1bd8e54f31d28357fffb
Reviewed-on: https://code.wireshark.org/review/25817
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/ascend_scanner.l | 12 | ||||
| -rw-r--r-- | wiretap/k12text.l | 10 |
2 files changed, 19 insertions, 3 deletions
diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l index 0fb90184da..133f0dfc5a 100644 --- a/wiretap/ascend_scanner.l +++ b/wiretap/ascend_scanner.l @@ -65,7 +65,10 @@ #include "ascend.h" #include "file_wrappers.h" -DIAG_OFF(sign-compare) +/* + * Disable diagnostics in the code generated by Flex. + */ +DIAG_OFF_FLEX #define YY_INPUT(buf,result,max_size) { \ ascend_state_t *parser_state = ascendget_extra(yyscanner); \ @@ -372,3 +375,10 @@ task:|task|at|time:|octets { return KEYWORD; } <<EOF>> { yyterminate(); } (.|\n) ; + +%% + +/* + * Turn diagnostics back on, so we check the code that we've written. + */ +DIAG_ON_FLEX diff --git a/wiretap/k12text.l b/wiretap/k12text.l index 5451b5eff8..be5d51379f 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -101,7 +101,10 @@ #define YY_NO_UNISTD_H #endif -DIAG_OFF(sign-compare) +/* + * Disable diagnostics in the code generated by Flex. + */ +DIAG_OFF_FLEX /* * State kept by the scanner. @@ -233,7 +236,10 @@ hdlc HDLC %% -DIAG_ON(sign-compare) +/* + * Turn diagnostics back on, so we check the code that we've written. + */ +DIAG_ON_FLEX /* Fill in pkthdr */ |