diff options
| author | Evan Huus <eapache@gmail.com> | 2021-07-16 11:36:34 -0400 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-21 05:38:29 +0000 |
| commit | d6d7dd1e5664810b368231d03d56465112e3d82e (patch) | |
| tree | 4f95a8b408e58b8edc0b4a2c17831b58049beaf3 /epan/dissectors/packet-slsk.c | |
| parent | ef542759d0c7003a495436f2194d5821bfc30bd4 (diff) | |
First pass pinfo->pool conversion
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.
I also tweaked a few of the docs which got caught up.
Diffstat (limited to 'epan/dissectors/packet-slsk.c')
| -rw-r--r-- | epan/dissectors/packet-slsk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 5b05d4f1d1..e5893b9f0c 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -845,10 +845,10 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item_ret_length(slsk_tree, hf_slsk_username, tvb, offset, 4, ENC_ASCII|ENC_LITTLE_ENDIAN, &str_len); offset += str_len; len = tvb_get_letohl(tvb, offset); - str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); + str = tvb_get_string_enc(pinfo->pool, 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_packet_scope(), str, len)); + format_text(pinfo->pool, str, len)); offset += 4+len; } else if (check_slsk_format(tvb, offset, "issiii")) { @@ -861,10 +861,10 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item_ret_length(slsk_tree, hf_slsk_username, tvb, offset, 4, ENC_ASCII|ENC_LITTLE_ENDIAN, &str_len); offset += str_len; len = tvb_get_letohl(tvb, offset); - str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); + str = tvb_get_string_enc(pinfo->pool, 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_packet_scope(), str, len)); + format_text(pinfo->pool, str, len)); offset += 4+len; proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1998,10 +1998,10 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item_ret_length(slsk_tree, hf_slsk_username, tvb, offset, 4, ENC_ASCII|ENC_LITTLE_ENDIAN, &str_len); offset += str_len; len = tvb_get_letohl(tvb, offset); - str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); + str = tvb_get_string_enc(pinfo->pool, 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_packet_scope(), str, len)); + format_text(pinfo->pool, str, len)); offset += 4+len; proto_tree_add_item(slsk_tree, hf_slsk_token, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; |