diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-21 20:08:11 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-21 20:08:11 +0000 |
| commit | 4985339e783559ef91fe5eacf3f48a40457c899e (patch) | |
| tree | e7cdae1be9f6629c67bda70c7df8ffe78fb9a32c | |
| parent | 839ee111f8408385fe827f723ec462a5e07248e6 (diff) | |
Get rid of Warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39980 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | asn1/tetra/packet-tetra-template.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-tetra.c | 13 |
2 files changed, 10 insertions, 12 deletions
diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c index 726bd1593c..7025aaabfb 100644 --- a/asn1/tetra/packet-tetra-template.c +++ b/asn1/tetra/packet-tetra-template.c @@ -323,12 +323,12 @@ static void dissect_tetra_UNITDATA_IND(tvbuff_t *tvb, packet_info *pinfo, proto_ /* Length */ rxreg = tvb_get_letohl(tvb, offset); - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_len0, tvb, offset, 4, rxreg); + proto_tree_add_uint(tetra_tree, hf_tetra_len0, tvb, offset, 4, rxreg); /* RvSteR */ offset += 4; rxreg = tvb_get_letohl(tvb, offset); - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_rvstr, tvb, offset, 4, rxreg); + proto_tree_add_uint(tetra_tree, hf_tetra_rvstr, tvb, offset, 4, rxreg); /* Logical channels */ channels = rxreg & 0x3; @@ -379,7 +379,7 @@ void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* TxR */ txreg = tvb_get_letohl(tvb, offset); - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_txreg, tvb, offset, 4, txreg); + proto_tree_add_uint(tetra_tree, hf_tetra_txreg, tvb, offset, 4, txreg); /* Logical channels */ channels = (txreg & 0x3) + 1; @@ -492,13 +492,12 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, ENC_NA); tetra_tree = proto_item_add_subtree(tetra_item, ett_tetra); - tetra_header_tree = proto_item_add_subtree(tetra_item, ett_tetra); offset ++; /* Carrier number */ if(include_carrier_number) { - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_carriernumber, tvb, offset, 1, carriernumber); + proto_tree_add_uint(tetra_tree, hf_tetra_carriernumber, tvb, offset, 1, carriernumber); offset ++; } diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index 93980f1a20..a42f77cb35 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -8838,12 +8838,12 @@ static void dissect_tetra_UNITDATA_IND(tvbuff_t *tvb, packet_info *pinfo, proto_ /* Length */ rxreg = tvb_get_letohl(tvb, offset); - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_len0, tvb, offset, 4, rxreg); + proto_tree_add_uint(tetra_tree, hf_tetra_len0, tvb, offset, 4, rxreg); /* RvSteR */ offset += 4; rxreg = tvb_get_letohl(tvb, offset); - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_rvstr, tvb, offset, 4, rxreg); + proto_tree_add_uint(tetra_tree, hf_tetra_rvstr, tvb, offset, 4, rxreg); /* Logical channels */ channels = rxreg & 0x3; @@ -8894,7 +8894,7 @@ void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* TxR */ txreg = tvb_get_letohl(tvb, offset); - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_txreg, tvb, offset, 4, txreg); + proto_tree_add_uint(tetra_tree, hf_tetra_txreg, tvb, offset, 4, txreg); /* Logical channels */ channels = (txreg & 0x3) + 1; @@ -9007,13 +9007,12 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, ENC_NA); tetra_tree = proto_item_add_subtree(tetra_item, ett_tetra); - tetra_header_tree = proto_item_add_subtree(tetra_item, ett_tetra); offset ++; /* Carrier number */ if(include_carrier_number) { - tetra_sub_item = proto_tree_add_uint(tetra_tree, hf_tetra_carriernumber, tvb, offset, 1, carriernumber); + proto_tree_add_uint(tetra_tree, hf_tetra_carriernumber, tvb, offset, 1, carriernumber); offset ++; } @@ -11487,7 +11486,7 @@ void proto_register_tetra (void) "T_simplex_duplex_selection_05", HFILL }}, /*--- End of included file: packet-tetra-hfarr.c ---*/ -#line 615 "../../asn1/tetra/packet-tetra-template.c" +#line 614 "../../asn1/tetra/packet-tetra-template.c" }; /* List of subtrees */ @@ -11768,7 +11767,7 @@ void proto_register_tetra (void) &ett_tetra_Modify_type, /*--- End of included file: packet-tetra-ettarr.c ---*/ -#line 625 "../../asn1/tetra/packet-tetra-template.c" +#line 624 "../../asn1/tetra/packet-tetra-template.c" }; /* execute protocol initialization only once */ |