diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-26 10:52:37 -0400 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-27 15:20:06 +0000 |
| commit | 2ab415579491e4bc66ea58627bda504cae833b9e (patch) | |
| tree | 0f7f8eaa4bd9d90c8f6066036522ef0fc65d137d /epan/dissectors/packet-obex.c | |
| parent | 8c37621ca733a24a972e3e069a537c06e650f435 (diff) | |
tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
Also some other tricks to remove unnecessary tvb_get_string_enc calls.
Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
Reviewed-on: https://code.wireshark.org/review/16158
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-obex.c')
| -rw-r--r-- | epan/dissectors/packet-obex.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index 52f8ce7bf5..9ef9202378 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -1960,11 +1960,13 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, break; case 0x44: /* Time (ISO8601) */ - proto_tree_add_item(hdr_tree, hf_time_iso8601, tvb, offset, value_length, ENC_ASCII | ENC_NA); - proto_item_append_text(hdr_tree, ": \"%s\"", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_length, ENC_ASCII)); + { + const guint8* time_str; + proto_tree_add_item_ret_string(hdr_tree, hf_time_iso8601, tvb, offset, value_length, ENC_ASCII | ENC_NA, wmem_packet_scope(), &time_str); + proto_item_append_text(hdr_tree, ": \"%s\"", time_str); offset += value_length; - + } break; case 0x48: /* Body */ case 0x49: /* End Of Body */ @@ -2058,11 +2060,13 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, break; case 0x51: /* Object Class */ - proto_tree_add_item(hdr_tree, hf_object_class, tvb, offset, value_length, ENC_ASCII | ENC_NA); - proto_item_append_text(hdr_tree, ": \"%s\"", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_length, ENC_ASCII)); + { + const guint8* obj_str; + proto_tree_add_item_ret_string(hdr_tree, hf_object_class, tvb, offset, value_length, ENC_ASCII | ENC_NA, wmem_packet_scope(), &obj_str); + proto_item_append_text(hdr_tree, ": \"%s\"", obj_str); offset += value_length; - + } break; case 0x52: /* Session Parameter */ while (value_length) { |