diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-31 07:51:19 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 17:08:47 +0000 |
| commit | 51a30142251e377ec28eb8584c56386c2481d6c0 (patch) | |
| tree | 4a4667a656f60327647805022e5811b6f2c42052 /epan/dissectors/packet-slsk.c | |
| parent | 0165b8c40cfd6ca529408862095c1213bdf1ebd5 (diff) | |
format_text_wmem -> format_text
All cases of the "original" format_text have been handled to add the
proper wmem allocator scope. Remove the "original" format_text
and replace it with one that has a wmem allocator as a parameter.
Change-Id: I278b93bcb4a17ff396413b75cd332f5fc2666719
Reviewed-on: https://code.wireshark.org/review/19884
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-slsk.c')
| -rw-r--r-- | epan/dissectors/packet-slsk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 6b095adc9b..4847d063a2 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -968,7 +968,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); proto_tree_add_string_format_value(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "%s (Char: %s)", connection_type(str), - format_text_wmem(wmem_packet_scope(), str, len)); + format_text(wmem_packet_scope(), str, len)); offset += 4+len; } else if (check_slsk_format(tvb, offset, "issiii")) { @@ -988,7 +988,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); proto_tree_add_string_format_value(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "%s (Char: %s)", connection_type(str), - format_text_wmem(wmem_packet_scope(), str, len)); + format_text(wmem_packet_scope(), str, len)); offset += 4+len; proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -2338,7 +2338,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); proto_tree_add_string_format_value(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "%s (Char: %s)", connection_type(str), - format_text_wmem(wmem_packet_scope(), str, len)); + format_text(wmem_packet_scope(), str, len)); offset += 4+len; proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset)); offset += 4; |