diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-13 13:51:05 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-14 19:46:42 +0000 |
| commit | e11d7ef08fc9b091e317d7cfd2abff1f21ca6276 (patch) | |
| tree | 16e8747c450db96d68b8c8e0aeda085dfe6d53cf /epan/print.c | |
| parent | 5cc0ad8672180128b32ef9e8f936011429665d88 (diff) | |
| download | wireshark-e11d7ef08fc9b091e317d7cfd2abff1f21ca6276.tar.gz | |
Fix diagnostics macros and squelch a gcc warning.
Both clang and gcc define __GNUC__. Make sure we account for that when
defining diagnostic macros.
Use DIAG_OFF + DIAG_ON to suppress gcc -pedantic warnings about
frame_data.
Get rid of packet_char_enc casts.
Change-Id: Idbcc61bcdb35c1d20f185461c69451dcdf73bae9
Reviewed-on: https://code.wireshark.org/review/7106
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/print.c')
| -rw-r--r-- | epan/print.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/print.c b/epan/print.c index 575ef52a11..9065ae8bcd 100644 --- a/epan/print.c +++ b/epan/print.c @@ -104,7 +104,7 @@ proto_tree_print(print_args_t *print_args, epan_dissect_t *edt, data.stream = stream; data.success = TRUE; data.src_list = edt->pi.data_src; - data.encoding = (packet_char_enc)edt->pi.fd->flags.encoding; + data.encoding = edt->pi.fd->flags.encoding; data.print_dissections = print_args->print_dissections; /* If we're printing the entire packet in hex, don't print uninterpreted data fields in hex as well. */ @@ -877,7 +877,7 @@ print_hex_data(print_stream_t *stream, epan_dissect_t *edt) return TRUE; cp = tvb_get_ptr(tvb, 0, length); if (!print_hex_data_buffer(stream, cp, length, - (packet_char_enc)edt->pi.fd->flags.encoding)) + edt->pi.fd->flags.encoding)) return FALSE; } return TRUE; |