diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-21 23:48:27 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-12 16:21:19 +0000 |
| commit | 2aab706c5a5d61c61bbff6e9e36a57afc4ef3be8 (patch) | |
| tree | 311fa08b5404d23cc4cfa644c87f84ab7422b61f /mergecap.c | |
| parent | 95142cf09d4789c9c68108b56f5fbe467108494f (diff) | |
| download | wireshark-2aab706c5a5d61c61bbff6e9e36a57afc4ef3be8.tar.gz wireshark-2aab706c5a5d61c61bbff6e9e36a57afc4ef3be8.tar.bz2 wireshark-2aab706c5a5d61c61bbff6e9e36a57afc4ef3be8.zip | |
Remove -Wwrite-strings compiler flag
The "-Wwrite-strings" flag produces nuisance warnings. These warnings are
not useful, they're impossible to fix in a sane way and therefore are being
handled with casts of static strings to (char *).
This just moves the warning to [-Wcast-qual] and a compiler pragma is
in turn required (and used) to squelch that warning.
Remove the Wwrite-strings warning. Let that responsibility fall on the
programmer (as is done by casting).
Change-Id: I5a44dfd9decd6d80797a521a3373593074962fb5
Reviewed-on: https://code.wireshark.org/review/12162
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mergecap.c b/mergecap.c index 287653621c..ef167d0587 100644 --- a/mergecap.c +++ b/mergecap.c @@ -254,13 +254,11 @@ main(int argc, char *argv[]) GString *comp_info_str; GString *runtime_info_str; int opt; -DIAG_OFF(cast-qual) static const struct option long_options[] = { - {(char *)"help", no_argument, NULL, 'h'}, - {(char *)"version", no_argument, NULL, 'V'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, {0, 0, 0, 0 } }; -DIAG_ON(cast-qual) gboolean do_append = FALSE; gboolean verbose = FALSE; int in_file_count = 0; |