diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2016-05-13 18:50:40 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2016-05-13 19:57:20 +0000 |
| commit | 4ec84a3e2b1023bb6d27fc4fdb3d69cd2385f2e2 (patch) | |
| tree | fb8553c2b92af9bd7e7c5b7a3a1f8e2629850161 /epan/dissectors/packet-kingfisher.c | |
| parent | 0766f78557624846f83c9f17012a5bba40238716 (diff) | |
Fix (spurious) checkAPIs issue
checkAPIs complains that the system member of the kingfisher_packet_t
structure shadows a system variable.
Althoguh this is a false positive, rename the variable to keep
checkAPIs happy.
Change-Id: Ia356dea5abb3ed93d10c5057f55786e2f28cec11
Reviewed-on: https://code.wireshark.org/review/15414
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'epan/dissectors/packet-kingfisher.c')
| -rw-r--r-- | epan/dissectors/packet-kingfisher.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index ea6b9593e9..66d0b60ea9 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.c @@ -58,7 +58,7 @@ static dissector_handle_t kingfisher_conv_handle; typedef struct _kingfisher_packet_t { guint8 version; - guint8 system; + guint8 system_id; guint16 from; guint16 target; guint16 via; @@ -245,7 +245,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean kfp.version = (kfp.function & 0x80)?3:2; - kfp.system = tvb_get_guint8( tvb, 0 ); + kfp.system_id = tvb_get_guint8( tvb, 0 ); kfp.message = tvb_get_guint8( tvb, 5 ); kfp.target = tvb_get_guint8( tvb, 1 ); @@ -276,7 +276,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean proto_tree_add_uint(kingfisher_tree, hf_kingfisher_version, tvb, 6, 1, kfp.version); /* system id */ - proto_tree_add_uint(kingfisher_tree, hf_kingfisher_system, tvb, 0, 1, kfp.system); + proto_tree_add_uint(kingfisher_tree, hf_kingfisher_system, tvb, 0, 1, kfp.system_id); /* target rtu */ proto_tree_add_uint(kingfisher_tree, hf_kingfisher_target, tvb, 1, 1, kfp.target); |