i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed a superfluous allocation (even without nothrow!), and a superfluous

Browse Source 
const_cast.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28645 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-11-14 09:58:18 +00:00
parent f8d77bfb1c
commit d662196ed0
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/textencoding/utf8_conversions.cpp
+4 -7
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2007, Haiku, Inc. All Rights Reserved. * Copyright 2003-2008, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -78,10 +78,9 @@ convert_encoding(const char* from, const char* to, const char* src,
iconvctl(conversion, ICONV_SET_DISCARD_ILSEQ, (void*)&zero); iconvctl(conversion, ICONV_SET_DISCARD_ILSEQ, (void*)&zero);
// prepare to convert the substitute character to target encoding // prepare to convert the substitute character to target encoding
char* original = new char[1]; char original = substitute;
original[0] = substitute;
size_t len = 1; size_t len = 1;
char* copy = original; char* copy = &original;
// Perform the conversion // Perform the conversion
// We ignore any errors during this as part of robustness/best-effort // We ignore any errors during this as part of robustness/best-effort
@@ -91,11 +90,9 @@ convert_encoding(const char* from, const char* to, const char* src,
iconv_t iso8859_1to = iconv_open(to,"ISO-8859-1"); iconv_t iso8859_1to = iconv_open(to,"ISO-8859-1");
if (iso8859_1to != (iconv_t)-1) { if (iso8859_1to != (iconv_t)-1) {
iconv(iso8859_1to, 0, 0, 0, 0); iconv(iso8859_1to, 0, 0, 0, 0);
iconv(iso8859_1to, const_cast<char**>(&copy), &len, &dst, iconv(iso8859_1to, &copy, &len, &dst, &outputLeft);
&outputLeft);
iconv_close(iso8859_1to); iconv_close(iso8859_1to);
} }
delete[] original;
break; break;
} }