[patch] enigma-1.01-xerces3.0 (amd64)

enigma-1.01-xerces3.0.patch (text/plain), 3.34 KB, created by Jimmy.Jazz on 2009-01-17 01:13:31 UTC

--- ./src/XMLtoUtf8.cc.orig	2009-01-16 23:33:55.000000000 +0100
+++ ./src/XMLtoUtf8.cc	2009-01-16 23:42:27.000000000 +0100
@@ -27,13 +27,13 @@
 namespace enigma
 {
     XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) {
-        unsigned int srcLength = XMLString::stringLen(toTranscode) + 1;
+        XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1;
         // make safe assumptions on utf-8 size
-        unsigned int maxDestLength = 3 * srcLength;
-        unsigned int charsEaten;
-        unsigned int destLength;
+        XMLSize_t maxDestLength = 3 * srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
         // make a buffer - size does not matter - the object is temporary 
-        utf8String = new char[maxDestLength];
+        XMLByte * utf8String = new XMLByte[maxDestLength];
         // transcode to utf-8 -- there are no unrepresentable chars
         destLength = app.xmlUtf8Transcoder->transcodeTo(toTranscode, srcLength,
                 (XMLByte *)utf8String, maxDestLength,
@@ -48,7 +48,7 @@
         delete [] utf8String;
     }
 
-    const char* XMLtoUtf8::c_str() const {
+    const char* XMLtoUtf8::c_str() const {
         return utf8String;
     };
 } //namespace enigma
--- src/Utf8ToXML.hh.orig	2009-01-16 23:58:06.621729545 +0100
+++ src/Utf8ToXML.hh	2009-01-17 00:00:09.342729145 +0100
@@ -43,7 +43,7 @@
          *
          * @param toTranscode utf-8 coded string
          */
-        Utf8ToXML(const char * const toTranscode);
+        Utf8ToXML(const XMLByte * const toTranscode);
         /**
          * Makes a transcoding to the local code page.
          *
@@ -69,7 +69,7 @@
          * A XML copy. We are the owner.
          */
         XMLCh * xmlString;
-        void init(const char * const toTranscode);
+        void init(const XMLByte * const toTranscode);
     };
 } //namespace enigma
 #endif
--- src/Utf8ToXML.cc.orig	2009-01-16 23:39:01.000000000 +0100
+++ src/Utf8ToXML.cc	2009-01-17 00:29:41.693729131 +0100
@@ -27,25 +27,25 @@
 
 namespace enigma
 {
-    Utf8ToXML::Utf8ToXML(const char * const toTranscode) {
+    Utf8ToXML::Utf8ToXML(const XMLByte * const toTranscode) {
         init(toTranscode);
     }
     
     Utf8ToXML::Utf8ToXML(const std::string * const toTranscode) {
-        init(toTranscode->c_str());
+        init((XMLByte *)toTranscode->c_str());
     }
     
     Utf8ToXML::Utf8ToXML(const std::string toTranscode) {
-        init(toTranscode.c_str());
+        init((XMLByte *)toTranscode.c_str());
     }
 
-    void Utf8ToXML::init(const char * const toTranscode) {
-        unsigned int srcLength = std::strlen(toTranscode) + 1;
+    void Utf8ToXML::init(const XMLByte * const toTranscode) {
+        XMLSize_t srcLength = (XMLSize_t) std::strlen((const char* )toTranscode) + 1;
         // make safe assumptions on utf-16 size
-        unsigned int maxDestLength = srcLength;
-        unsigned int charsEaten;
-        unsigned int destLength;
-        unsigned char *charSizes = new unsigned char[maxDestLength]; // just junk
+        XMLSize_t maxDestLength = srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
+        XMLByte *charSizes = new XMLByte[maxDestLength]; // just junk
         // make a buffer - size does not matter - the object is temporary 
         xmlString = new XMLCh[maxDestLength];
         // transcode to utf-8 -- there are no unrepresentable chars