tng 2003/01/10 10:43:31
Modified: c/src/xercesc/util/Transcoders/Iconv IconvTransService.cpp
Log:
[Bug 13909] Use of non standard mbstowcs feature.
Revision Changes Path
1.10 +8 -4
xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
Index: IconvTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IconvTransService.cpp 6 Jan 2003 21:48:05 -0000 1.9
+++ IconvTransService.cpp 10 Jan 2003 18:43:31 -0000 1.10
@@ -257,11 +257,15 @@
if (!srcText)
return 0;
- const unsigned int retVal = ::mbstowcs(NULL, srcText, 0);
+ unsigned charLen = ::mblen(srcText, MB_CUR_MAX);
+ if (charLen == -1)
+ return 0;
+ else if (charLen != 0)
+ charLen = strlen(srcText)/charLen;
- if (retVal == ~0)
+ if (charLen == -1)
return 0;
- return retVal;
+ return charLen;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
