diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-05-23 14:26:43 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-05-23 14:26:43 +0000 |
| commit | 8889f829c02c0fa90af8fe4c97ec1f72bb11d1c2 (patch) | |
| tree | 0941de44235c35ecc85e0843eecc1b3d97faf4e7 /epan/dissectors/packet-dect.c | |
| parent | 33fe1d803a5776b4976f9941ba009d32712eca34 (diff) | |
| download | wireshark-8889f829c02c0fa90af8fe4c97ec1f72bb11d1c2.tar.gz | |
Use correct subtree in a few cases: Fixes Coverity 921,894,878 & 1136;
svn path=/trunk/; revision=37361
Diffstat (limited to 'epan/dissectors/packet-dect.c')
| -rw-r--r-- | epan/dissectors/packet-dect.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 2320c4f42d..4ebd89d71f 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -40,9 +40,12 @@ # include "config.h" #endif +#include <string.h> + +#include <glib.h> + #include <epan/packet.h> #include <epan/etypes.h> -#include <string.h> #define ETHERTYPE_DECT 0x2323 @@ -214,7 +217,7 @@ static int hf_dect_A_Tail_Mt_Encr_Cmd2 = -1; static int hf_dect_A_Tail_Pt_ExtFlag = -1; static int hf_dect_A_Tail_Pt_SDU = -1; static int hf_dect_A_Tail_Pt_RFPI = -1; -static int hf_dect_A_Tail_Pt_BsData = -1; +static int hf_dect_A_Tail_Pt_BsData = -1; static int hf_dect_A_Tail_Pt_InfoType = -1; static int hf_dect_A_Tail_Pt_SlotPairs = -1; static int hf_dect_A_Tail_Pt_Fillbits = -1; @@ -1440,7 +1443,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, AField = proto_item_add_subtree(afieldti, ett_afield); /* Header */ - aheadti = proto_tree_add_item(afieldti, hf_dect_A_Head, tvb, offset, 1, FALSE); + aheadti = proto_tree_add_item(AField, hf_dect_A_Head, tvb, offset, 1, FALSE); AHead = proto_item_add_subtree(aheadti, ett_ahead); if(dect_packet_type==DECT_PACKET_FP) @@ -1456,12 +1459,12 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, /* Tail */ if(dect_packet_type==DECT_PACKET_FP) { - atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5, + atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5, "FP-Tail: %s", val_to_str(ta, TA_vals_FP, "Error, please report: %d")); } else { - atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5, + atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5, "PP-Tail: %s", val_to_str(ta, TA_vals_PP, "Error, please report: %d")); } @@ -1806,7 +1809,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, if(((tail_0&0x70)>>4)&0xfe) ep_strbuf_append_printf(afield_str,"%s, ",val_to_str((tail_0&0x70)>>4, PTSDU_vals, "Error, please report: %d")); - + switch((tail_0&0x70)>>4) { case 0: /* Zero Length Page */ @@ -2135,7 +2138,7 @@ proto_register_dect(void) { &hf_dect_A_Tail_Qt_0_CA, {"CA", "dect.afield.tail.Qt.CA", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - + /* Byte 3 */ { &hf_dect_A_Tail_Qt_0_Spr1, {"Spr1", "dect.afield.tail.Qt.Spr1", FT_UINT8, BASE_DEC, VALS(QTSpr_vals), |