diff options
author | Bill Meier <wmeier@newsguy.com> | 2011-10-23 22:58:45 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2011-10-23 22:58:45 +0000 |
commit | d7a184020418cfa3b62f8983045015b5f9521600 (patch) | |
tree | fd74f7a4c2d4a44f5a145561dc897bbb452c128d /epan/dissectors/packet-ms-mms.c | |
parent | 051d46467f516b623ab4ce039ac06e0f0a5d505f (diff) |
Replace use of tvb_get_ephemeral_faked_unicode() by use of tvb_get_ephemeral_unicode_string();
Fix encoding arg as needed.
svn path=/trunk/; revision=39530
Diffstat (limited to 'epan/dissectors/packet-ms-mms.c')
-rw-r--r-- | epan/dissectors/packet-ms-mms.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 79ec91e841..24be0ffbd4 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -763,7 +763,7 @@ static void dissect_client_transport_info(tvbuff_t *tvb, packet_info *pinfo, pro offset += 4; /* Extract and show the string in tree and info column */ - transport_info = tvb_get_ephemeral_faked_unicode(tvb, offset, (length_remaining - 20)/2, TRUE); + transport_info = tvb_get_ephemeral_unicode_string(tvb, offset, (length_remaining - 20)/2, ENC_LITTLE_ENDIAN); proto_tree_add_string_format(tree, hf_msmms_command_client_transport_info, tvb, offset, length_remaining-20, @@ -864,7 +864,7 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Server version string */ if (server_version_length > 1) { - server_version = tvb_get_ephemeral_faked_unicode(tvb, offset, server_version_length, TRUE); + server_version = tvb_get_ephemeral_unicode_string(tvb, offset, server_version_length, ENC_LITTLE_ENDIAN); /* Server version string */ proto_tree_add_string(tree, hf_msmms_command_server_version, tvb, @@ -880,7 +880,7 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Tool version string */ if (tool_version_length > 1) { - tool_version = tvb_get_ephemeral_faked_unicode(tvb, offset, tool_version_length, TRUE); + tool_version = tvb_get_ephemeral_unicode_string(tvb, offset, tool_version_length, ENC_LITTLE_ENDIAN); /* Server version string */ proto_tree_add_string(tree, hf_msmms_command_tool_version, tvb, @@ -892,7 +892,7 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Download update player url string */ if (download_update_player_length > 1) { - download_update_player = tvb_get_ephemeral_faked_unicode(tvb, offset, download_update_player_length, TRUE); + download_update_player = tvb_get_ephemeral_unicode_string(tvb, offset, download_update_player_length, ENC_LITTLE_ENDIAN); proto_tree_add_string(tree, hf_msmms_command_update_url, tvb, offset, download_update_player_length*2, @@ -903,7 +903,7 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Password encryption type string */ if (password_encryption_type_length > 1) { - password_encryption_type = tvb_get_ephemeral_faked_unicode(tvb, offset, password_encryption_type_length, TRUE); + password_encryption_type = tvb_get_ephemeral_unicode_string(tvb, offset, password_encryption_type_length, ENC_LITTLE_ENDIAN); proto_tree_add_string(tree, hf_msmms_command_password_type, tvb, offset, password_encryption_type_length*2, @@ -929,7 +929,7 @@ static void dissect_client_player_info(tvbuff_t *tvb, packet_info *pinfo, proto_ offset += 4; /* Extract and show the string in tree and info column */ - player_info = tvb_get_ephemeral_faked_unicode(tvb, offset, (length_remaining - 12)/2, TRUE); + player_info = tvb_get_ephemeral_unicode_string(tvb, offset, (length_remaining - 12)/2, ENC_LITTLE_ENDIAN); proto_tree_add_string(tree, hf_msmms_command_client_player_info, tvb, offset, length_remaining-12, @@ -1022,7 +1022,7 @@ static void dissect_request_server_file(tvbuff_t *tvb, packet_info *pinfo, proto offset += 4; /* File path on server */ - server_file = tvb_get_ephemeral_faked_unicode(tvb, offset, (length_remaining - 16)/2, TRUE); + server_file = tvb_get_ephemeral_unicode_string(tvb, offset, (length_remaining - 16)/2, ENC_LITTLE_ENDIAN); proto_tree_add_string(tree, hf_msmms_command_server_file, tvb, offset, length_remaining-16, @@ -1112,7 +1112,7 @@ static void dissect_transport_info_response(tvbuff_t *tvb, proto_tree *tree, offset += 4; /* Read this strange string */ - strange_string = tvb_get_ephemeral_faked_unicode(tvb, offset, (length_remaining - 12)/2, TRUE); + strange_string = tvb_get_ephemeral_unicode_string(tvb, offset, (length_remaining - 12)/2, ENC_LITTLE_ENDIAN); proto_tree_add_string(tree, hf_msmms_command_strange_string, tvb, offset, length_remaining-12, |