diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 19:24:52 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-08 07:18:09 +0000 |
| commit | cff098e3eb6a871a1e39559d27b33dc3a3437c2c (patch) | |
| tree | f4ec6b456958bd5ebf0ba5204f5424f8c477838a /epan/dissectors/packet-mbim.c | |
| parent | 5d610b58c5c45c0bb555d227a684785a0721f434 (diff) | |
guid_to_ep_str -> guid_to_str
guid_to_str now uses wmem allocation.
Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359
Reviewed-on: https://code.wireshark.org/review/6391
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mbim.c')
| -rw-r--r-- | epan/dissectors/packet-mbim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index aa361fbb7f..66db5dee36 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -1780,14 +1780,14 @@ mbim_dissect_service_id_uuid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * *uuid_ext_info = (struct mbim_uuid_ext *)wmem_map_lookup(mbim_uuid_ext_hash, uuid_ext); if (*uuid_ext_info) { proto_tree_add_guid_format_value(tree, hf, tvb, *offset, 16, &uuid, "%s (%s)", - (*uuid_ext_info)->uuid_name, guid_to_ep_str(&uuid)); + (*uuid_ext_info)->uuid_name, guid_to_str(wmem_packet_scope(), &uuid)); *offset += 16; return UUID_EXT_IDX; } } proto_tree_add_guid_format_value(tree, hf, tvb, *offset, 16, &uuid, "%s (%s)", - val_to_str_const(i, mbim_service_id_vals, "Unknown"), guid_to_ep_str(&uuid)); + val_to_str_const(i, mbim_service_id_vals, "Unknown"), guid_to_str(wmem_packet_scope(), &uuid)); *offset += 16; return i; @@ -2298,7 +2298,7 @@ mbim_dissect_context_type_uuid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } } proto_tree_add_guid_format_value(tree, hf_mbim_context_type, tvb, *offset, 16, &uuid, "%s (%s)", - val_to_str_const(i, mbim_context_type_vals, "Unknown"), guid_to_ep_str(&uuid)); + val_to_str_const(i, mbim_context_type_vals, "Unknown"), guid_to_str(wmem_packet_scope(), &uuid)); *offset += 16; return i; |