X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling%2Funicode.cpp;h=dc0774c422dca6c6bb7cec0d5dd0a464a3372932;hp=b8deeb32912d14ae6bda0fab1e87c1aae43bf388;hb=a5e86d37cf40004e6a43a21ab67d26695fa8619c;hpb=7a76ad29ed3e8fea449036d0923986f61408bf1f diff --git a/xmltooling/unicode.cpp b/xmltooling/unicode.cpp index b8deeb3..dc0774c 100644 --- a/xmltooling/unicode.cpp +++ b/xmltooling/unicode.cpp @@ -26,12 +26,14 @@ #include #include +using namespace xercesc; + static const XMLCh UTF8[]={ chLatin_U, chLatin_T, chLatin_F, chDigit_8, chNull }; char* xmltooling::toUTF8(const XMLCh* src, bool use_malloc) { - unsigned int eaten,factor=1,bufsize; - unsigned int srclen=XMLString::stringLen(src); + xsecsize_t eaten,factor=1,bufsize; + xsecsize_t srclen=XMLString::stringLen(src); XMLUTF8Transcoder t(UTF8, 4096); // block size isn't used any more anyway do { bufsize = factor*srclen + 10; @@ -63,8 +65,8 @@ char* xmltooling::toUTF8(const XMLCh* src, bool use_malloc) XMLCh* xmltooling::fromUTF8(const char* src, bool use_malloc) { - unsigned int eaten; - unsigned int srclen=strlen(src); + xsecsize_t eaten; + xsecsize_t srclen=strlen(src); XMLUTF8Transcoder t(UTF8, 4096); // block size isn't used any more anyway XMLCh* buf = use_malloc ? reinterpret_cast(malloc((srclen+1)*sizeof(XMLCh))) : new XMLCh[srclen + 1]; unsigned char* sizes=new unsigned char[srclen];