N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

String_util: Explicitly use a const_cast when calling iconv

Browse source
This commit is contained in:
Paul "Dettorer" Hervot 2015-11-29 11:48:39 +01:00 committed by Paul Dettorer Hervot
parent 37a0a22010
commit b1890d012c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/string_util.cpp
View file

@ -391,8 +391,14 @@ static std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>&
while (0 != src_bytes) while (0 != src_bytes)
{ {
size_t const iconv_result = iconv(conv_desc, (char**)(&src_buffer), &src_bytes, const char** iconv_inbuff = reinterpret_cast<const char**>(&src_buffer);
&dst_buffer, &dst_bytes);
// This const_cast is here because iconv declares its second argument as
// "char**" where it should be "const char**" because the only thing
// actually modified is the pointer, hence the const_cast.
const size_t iconv_result = iconv(conv_desc,
const_cast<char**>(iconv_inbuff),
&src_bytes, &dst_buffer, &dst_bytes);
if (static_cast<size_t>(-1) == iconv_result) if (static_cast<size_t>(-1) == iconv_result)
{ {