diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-29 21:53:49 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 02:26:35 +0000 |
| commit | d802b5b0ec8e10fbf64f6c76815b759323029bb4 (patch) | |
| tree | 2071ff718141347ff02c8dc02aafb9090e8fc5e1 /epan/dissectors/packet-aim.c | |
| parent | 60a877167f05644a5a75676798084027accd1c3d (diff) | |
Add format_text_wmem.
This allows for a wmem_allocator for users of format_text who want
it (dissectors for wmem_packet_scope()). This lessens the role of
current format_text functionality in hopes that it will eventually
be replaced.
Change-Id: I970557a65e32aa79634a3fcc654ab641b871178e
Reviewed-on: https://code.wireshark.org/review/19855
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 0327887598..8cf264aa89 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1198,7 +1198,7 @@ dissect_aim_tlv_value_string (proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb string_len = tvb_reported_length(tvb); buf = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, string_len, ENC_UTF_8|ENC_NA); - proto_item_set_text(ti, "Value: %s", format_text(buf, string_len)); + proto_item_set_text(ti, "Value: %s", format_text_wmem(wmem_packet_scope(), buf, string_len)); return string_len; } @@ -1317,7 +1317,7 @@ dissect_aim_tlv_value_messageblock (proto_item *ti, guint16 valueid _U_, tvbuff_ /* The actual message */ buf = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, blocklen - 4, ENC_ASCII|ENC_NA); proto_item_append_text(ti, "Message: %s ", - format_text(buf, blocklen - 4)); + format_text_wmem(wmem_packet_scope(), buf, blocklen - 4)); proto_tree_add_item(entry, hf_aim_messageblock_message, tvb, offset, blocklen-4, ENC_ASCII|ENC_NA); @@ -1882,7 +1882,7 @@ static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, pro col_set_str(pinfo->cinfo, COL_INFO, "Oncoming Buddy"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", - format_text(buddyname, buddyname_length)); + format_text_wmem(wmem_packet_scope(), buddyname, buddyname_length)); offset += dissect_aim_buddyname(tvb, pinfo, offset, buddy_tree); @@ -1905,7 +1905,7 @@ static int dissect_aim_buddylist_offgoing(tvbuff_t *tvb, packet_info *pinfo, pro col_set_str(pinfo->cinfo, COL_INFO, "Offgoing Buddy"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", - format_text(buddyname, buddyname_length)); + format_text_wmem(wmem_packet_scope(), buddyname, buddyname_length)); offset += dissect_aim_buddyname(tvb, pinfo, offset, buddy_tree); @@ -3031,7 +3031,7 @@ dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree /* Add the outgoing username to the info column */ buddyname_length = aim_get_buddyname(&buddyname, tvb, offset); col_append_fstr(pinfo->cinfo, COL_INFO, " to: %s", - format_text(buddyname, buddyname_length)); + format_text_wmem(wmem_packet_scope(), buddyname, buddyname_length)); offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree); @@ -3402,7 +3402,7 @@ static int dissect_aim_snac_signon_signon(tvbuff_t *tvb, packet_info *pinfo, buddyname_length = aim_get_buddyname( &buddyname, tvb, offset ); col_append_fstr(pinfo->cinfo, COL_INFO, " Username: %s", - format_text(buddyname, buddyname_length)); + format_text_wmem(wmem_packet_scope(), buddyname, buddyname_length)); if(tree) { offset+=dissect_aim_buddyname(tvb, pinfo, offset, tree); |