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-ms-mms.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-ms-mms.c')
| -rw-r--r-- | epan/dissectors/packet-ms-mms.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 6fc8a9d456..4626cc3e5e 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -751,7 +751,7 @@ static void dissect_client_transport_info(tvbuff_t *tvb, packet_info *pinfo, pro transport_info, "Transport: (%s)", transport_info); col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", - format_text_wmem(wmem_packet_scope(), (guchar*)transport_info, length_remaining - 20)); + format_text(wmem_packet_scope(), (guchar*)transport_info, length_remaining - 20)); /* Try to extract details from this string */ @@ -848,7 +848,7 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t ENC_UTF_16|ENC_LITTLE_ENDIAN, wmem_packet_scope(), &server_version); col_append_fstr(pinfo->cinfo, COL_INFO, " (version='%s')", - format_text_wmem(wmem_packet_scope(), (guchar*)server_version, strlen(server_version))); + format_text(wmem_packet_scope(), (guchar*)server_version, strlen(server_version))); } offset += (server_version_length*2); @@ -902,7 +902,7 @@ static void dissect_client_player_info(tvbuff_t *tvb, packet_info *pinfo, proto_ ENC_UTF_16|ENC_LITTLE_ENDIAN, wmem_packet_scope(), &player_info); col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", - format_text_wmem(wmem_packet_scope(), (guchar*)player_info, strlen(player_info))); + format_text(wmem_packet_scope(), (guchar*)player_info, strlen(player_info))); } /* Dissect info about where client wants to start playing from */ @@ -977,7 +977,7 @@ static void dissect_request_server_file(tvbuff_t *tvb, packet_info *pinfo, proto ENC_UTF_16|ENC_LITTLE_ENDIAN, wmem_packet_scope(), &server_file); col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", - format_text_wmem(wmem_packet_scope(), (guchar*)server_file, strlen(server_file))); + format_text(wmem_packet_scope(), (guchar*)server_file, strlen(server_file))); } /* Dissect media details from server */ |