rewrite for libFoundation compat

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1465 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index 77dead4b4684ab6a303db89d680710dcee82a089..c4566d4cfcdd54c2a0923d3397c38edf1c8a0ce3 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * libxmlSAXDriver.m: rewrote decoding of hexadecimal entities as
+         this used functionality not present in libFoundation (v4.7.26)
+
 2007-03-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * libxmlSAXDriver.m: properly decode #%i; values in attributes -

diff --git a/sope-xml/libxmlSAXDriver/Version b/sope-xml/libxmlSAXDriver/Version
index 270c14ca3f2859758b1a28b8a7e97c7ba6595ccc..60803b074ff0f9ebf7c936c90417cbb3b7a807b8 100644 (file)
--- a/sope-xml/libxmlSAXDriver/Version
+++ b/sope-xml/libxmlSAXDriver/Version
@@ -1,3 +1,3 @@
 # version
 
-SUBMINOR_VERSION:=25
+SUBMINOR_VERSION:=26

diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist b/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist
index 4b2b1c44ac679a62e40dbd9029fb6534231d0aa1..193c0ed155ee526131b322ae83a66d4bbadd56cc 100644 (file)
--- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist
+++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist
@@ -21,6 +21,6 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>4.7.25</string>
+       <string>4.7.26</string>
 </dict>
 </plist>

diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
index eed749695563d3fe513717aafc6d594cd5cf9697..599a2c057bf9370e50b87373f2f859d62991ed81 100644 (file)
--- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
+++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
@@ -120,11 +120,13 @@ static inline NSString *xmlCharsToDecodedString(const xmlChar *_s) {
           c = (unichar)charAt(s, @selector(characterAtIndex:), i + 2);
           /* hex value? */
           if (c == 'x' || c == 'X') {
-            unsigned value;
+            const char *shex;
+            unsigned   value;
             
             vr    = NSMakeRange(i + 3, r.location - i - 3);
-            value = [[NSScanner scannerWithString:[s substringWithRange:vr]]
-                                                  scanHexInt:&value];
+            shex  = [[s substringWithRange:vr]
+                        cStringUsingEncoding:NSASCIIStringEncoding];
+            sscanf(shex, "%x", &value);
             c = (unichar)value;
           }
           else {