lF fixes

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

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index c4566d4cfcdd54c2a0923d3397c38edf1c8a0ce3..7a6aa4c49ea8437f028e021792a90f1f56b831ab 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-03  Helge Hess  <helge.hess@opengroupware.org>
+
+       * libXMLSaxDriver.m: fixed last changes for libFoundation (v4.5.24)
+       
 2007-03-18  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * libxmlSAXDriver.m: rewrote decoding of hexadecimal entities as

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

diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
index 599a2c057bf9370e50b87373f2f859d62991ed81..65596f08933106e9bfee0ce79cb1dc39eba21ecd 100644 (file)
--- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
+++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2007 SKYRIX Software AG
+  Copyright (C) 2007      Helge Hess
 
   This file is part of SOPE.
 
@@ -101,7 +102,10 @@ static inline NSString *xmlCharsToDecodedString(const xmlChar *_s) {
       break;
     }
   }
+  
   if (needsDecoding) {
+    // TODO: This needs *serious* cleanup. Two small unichar buffers
+    //       would be 10x faster and half the codesize.
     NSMutableString *ds;
     
     ds = [[NSMutableString alloc] initWithCapacity:len];
@@ -124,8 +128,7 @@ static inline NSString *xmlCharsToDecodedString(const xmlChar *_s) {
             unsigned   value;
             
             vr    = NSMakeRange(i + 3, r.location - i - 3);
-            shex  = [[s substringWithRange:vr]
-                        cStringUsingEncoding:NSASCIIStringEncoding];
+            shex  = [[s substringWithRange:vr] cString];
             sscanf(shex, "%x", &value);
             c = (unichar)value;
           }