diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-25 16:12:43 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-25 17:28:08 +0000 |
| commit | 6c374a2a5c6c5125ab3ebacb922ca3978d9c0a9d (patch) | |
| tree | 8c2a849502eb4a4717abab317c46c454e3ad3a42 /plugins | |
| parent | 8a5bce55df05b3d246004c978a5889adab231ba3 (diff) | |
| download | wireshark-6c374a2a5c6c5125ab3ebacb922ca3978d9c0a9d.tar.gz | |
profinet (pn-rt): fix 'pn_rt.ds_redundancy' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
Change-Id: I5c74a34619ea66c3ac2a77d10b31a3f1256c6595
Reviewed-on: https://code.wireshark.org/review/20707
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/profinet/packet-pn-rt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index 4dee180950..303e24d8a6 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -138,11 +138,8 @@ static const value_string pn_rt_frame_info_function_meaning_output_conv[] = { { 0, NULL } }; -static const value_string pn_rt_ds_redundancy[] = { - { 0x00, "Redundancy has no meaning for OutputCRs / One primary AR of a given AR-set is present" }, - { 0x01, "None primary AR of a given AR-set is present" }, - { 0, NULL } -}; +static const true_false_string tfs_pn_rt_ds_redundancy = + {"Redundancy has no meaning for OutputCRs / One primary AR of a given AR-set is present" , "None primary AR of a given AR-set is present" }; static const value_string pn_rt_frag_status_error[] = { { 0x00, "reserved" }, @@ -992,7 +989,7 @@ proto_register_pn_rt(void) { &hf_pn_rt_data_status_redundancy, { "Redundancy", "pn_rt.ds_redundancy", - FT_UINT8, BASE_HEX, VALS(pn_rt_ds_redundancy), 0x02, + FT_BOOLEAN, 8, TFS(&tfs_pn_rt_ds_redundancy), 0x02, NULL, HFILL }}, { &hf_pn_rt_data_status_redundancy_output_cr, |