diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-04 19:23:39 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-04 19:23:39 +0000 |
| commit | 630ba9f7f7677313d422098be2437c405d67bcfd (patch) | |
| tree | d2fcf7f4537bc7aca5a3c51d69bf29c6adbdaba8 /epan/dissectors/packet-bacapp.c | |
| parent | f39dd8f1a5d325a2c9e8cce3a469c61bc1675043 (diff) | |
Don't assign to a proto_item * if the value won't be used: Coverity 846 & 848;
Also: remove some unneeded #includes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36464 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-bacapp.c')
| -rw-r--r-- | epan/dissectors/packet-bacapp.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 2e3211f29c..94b6e4200c 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -31,9 +31,6 @@ # include "config.h" #endif -#include <stdlib.h> -#include <string.h> - #include <glib.h> #include <epan/packet.h> @@ -8507,9 +8504,9 @@ fStartConfirmed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *bacapp_tree, if (ack == 0) /* The following are for ConfirmedRequest, not Complex ack */ { proto_tree_add_item(bacapp_tree_control, hf_bacapp_SA, tvb, offset++, 1, TRUE); - proto_tree_add_item(bacapp_tree, hf_bacapp_response_segments, tvb, + proto_tree_add_item(bacapp_tree, hf_bacapp_response_segments, tvb, offset, 1, TRUE); - proto_tree_add_item(bacapp_tree, hf_bacapp_max_adpu_size, tvb, + proto_tree_add_item(bacapp_tree, hf_bacapp_max_adpu_size, tvb, offset, 1, TRUE); } offset++; @@ -8566,9 +8563,7 @@ fSimpleAckPDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *bacapp_tree, gu { /* BACnet-Simple-Ack-PDU */ /* ASHRAE 135-2001 20.1.4 */ - proto_item *tc; - - tc = proto_tree_add_item(bacapp_tree, hf_bacapp_type, tvb, offset++, 1, TRUE); + proto_tree_add_item(bacapp_tree, hf_bacapp_type, tvb, offset++, 1, TRUE); proto_tree_add_item(bacapp_tree, hf_bacapp_invoke_id, tvb, offset++, 1, TRUE); @@ -8807,7 +8802,7 @@ fErrorPDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bacapp_tree, guint offs { /* BACnet-Error-PDU */ /* ASHRAE 135-2001 20.1.7 */ - proto_item *tc, *tt; + proto_item *tc; proto_tree *bacapp_tree_control; guint8 tmp; @@ -8817,7 +8812,7 @@ fErrorPDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bacapp_tree, guint offs proto_tree_add_item(bacapp_tree, hf_bacapp_invoke_id, tvb, offset++, 1, TRUE); tmp = tvb_get_guint8(tvb, offset); - tt = proto_tree_add_item(bacapp_tree, hf_bacapp_service, tvb, + proto_tree_add_item(bacapp_tree, hf_bacapp_service, tvb, offset++, 1, TRUE); /* Error Handling follows... */ return fBACnetError (tvb, pinfo, bacapp_tree, offset, tmp); @@ -8832,7 +8827,7 @@ fRejectPDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *bacapp_tree, guint proto_tree *bacapp_tree_control; tc = proto_tree_add_item(bacapp_tree, hf_bacapp_type, tvb, offset++, 1, TRUE); - bacapp_tree_control = proto_item_add_subtree(tc, ett_bacapp); + bacapp_tree_control = proto_item_add_subtree(tc, ett_bacapp); proto_tree_add_item(bacapp_tree, hf_bacapp_invoke_id, tvb, offset++, 1, TRUE); |