diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-05-21 22:20:29 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-05-27 11:02:30 +0000 |
| commit | 4963c772852134b75561290d152be2acbe0597d9 (patch) | |
| tree | c6e6f2f683587e58aea96355cdadd2472215c4c4 /epan/dissectors/packet-sasp.c | |
| parent | a25c46bc7b3d2ba2a3674cdcf9cfc1cc79bfc022 (diff) | |
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Final part.
While there change deprecated tvb_length-xxx() calls
Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79
Reviewed-on: https://code.wireshark.org/review/8642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sasp.c')
| -rw-r--r-- | epan/dissectors/packet-sasp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 3c0567c1db..ac3f4fd824 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -357,7 +357,7 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data "Invalid SASP Header Type [0x%04x]", hdr_type); /* XXX: The folowing should actually happen automatically ? */ col_set_str(pinfo->cinfo, COL_INFO, "[Malformed: Invalid SASP Header Type]"); - return tvb_length(tvb); + return tvb_reported_length(tvb); } offset += 2; @@ -462,7 +462,7 @@ dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data "Unknown SASP Message Type: 0x%4x", msg_type); break; } - return tvb_length(tvb); + return tvb_reported_length(tvb); } @@ -471,7 +471,7 @@ dissect_sasp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { tcp_dissect_pdus(tvb, pinfo, tree, sasp_desegment, SASP_MIN_PACKET_LEN, get_sasp_pdu_len, dissect_sasp_pdu, data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } @@ -925,7 +925,6 @@ static guint32 dissect_memstatedatacomp(tvbuff_t *tvb, proto_tree *pay_load, gui { proto_tree *memstatedatacomp_tree; proto_tree *memdatacomp_tree; - guint8 memstate_flag; offset = dissect_memdatacomp(tvb, pay_load, offset, &memdatacomp_tree); @@ -947,9 +946,8 @@ static guint32 dissect_memstatedatacomp(tvbuff_t *tvb, proto_tree *pay_load, gui offset += 1; /* Quiesce flag*/ - memstate_flag = tvb_get_guint8(tvb, offset); - proto_tree_add_boolean(memstatedatacomp_tree, hf_sasp_memstatedatacomp_quiesce_flag, - tvb, offset, 1, memstate_flag); + proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_quiesce_flag, + tvb, offset, 1, ENC_NA); offset += 1; return offset; |