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

added iconv_close to free resources and made a new input_buffer_t typedef to ease switching iconv implementations

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4150 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2003-07-31 04:57:37 +00:00
parent ec4fc3af6a
commit 5f410263f9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/utf8_conversions.cpp
+6 -2
View File
@@ -7,6 +7,8 @@
using namespace BPrivate; using namespace BPrivate;
typedef char ** input_buffer_t;
status_t status_t
convert_to_utf8(uint32 srcEncoding, convert_to_utf8(uint32 srcEncoding,
const char * src, int32 * srcLen, const char * src, int32 * srcLen,
@@ -21,7 +23,7 @@ convert_to_utf8(uint32 srcEncoding,
if (conversion == (iconv_t)-1) { if (conversion == (iconv_t)-1) {
return B_ERROR; return B_ERROR;
} }
const char ** inputBuffer = const_cast<const char**>(&src); input_buffer_t inputBuffer = const_cast<input_buffer_t>(&src);
size_t charsLeft = *dstLen; size_t charsLeft = *dstLen;
size_t inputLength = *srcLen; size_t inputLength = *srcLen;
size_t bytesLeft = iconv(conversion,inputBuffer,&inputLength,&dst,&charsLeft); size_t bytesLeft = iconv(conversion,inputBuffer,&inputLength,&dst,&charsLeft);
@@ -30,6 +32,7 @@ convert_to_utf8(uint32 srcEncoding,
if ((bytesLeft != 0) && (errno != E2BIG) && (errno != EINVAL)) { if ((bytesLeft != 0) && (errno != E2BIG) && (errno != EINVAL)) {
return B_ERROR; return B_ERROR;
} }
iconv_close(conversion);
return B_OK; return B_OK;
} }
@@ -47,7 +50,7 @@ convert_from_utf8(uint32 dstEncoding,
if (conversion == (iconv_t)-1) { if (conversion == (iconv_t)-1) {
return B_ERROR; return B_ERROR;
} }
const char ** inputBuffer = const_cast<const char**>(&src); input_buffer_t inputBuffer = const_cast<input_buffer_t>(&src);
size_t charsLeft = *dstLen; size_t charsLeft = *dstLen;
size_t inputLength = *srcLen; size_t inputLength = *srcLen;
size_t bytesLeft = iconv(conversion,inputBuffer,&inputLength,&dst,&charsLeft); size_t bytesLeft = iconv(conversion,inputBuffer,&inputLength,&dst,&charsLeft);
@@ -56,5 +59,6 @@ convert_from_utf8(uint32 dstEncoding,
if ((bytesLeft != 0) && (errno != E2BIG) && (errno != EINVAL)) { if ((bytesLeft != 0) && (errno != E2BIG) && (errno != EINVAL)) {
return B_ERROR; return B_ERROR;
} }
iconv_close(conversion);
return B_OK; return B_OK;
} }