From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 18 Mar 2007 16:45:47 +0000 (+0000)
Subject: rewrite for libFoundation compat
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46318fdfdd5ecb4b42d63691d97f584c7e59a1a6;p=sope

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 77dead4b..c4566d4c 100644
--- 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 270c14ca..60803b07 100644
--- 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 4b2b1c44..193c0ed1 100644
--- 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 eed74969..599a2c05 100644
--- 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 {