localize use of CFStringCreate function

Author: mpw

GNUmakefile

@@ -3,6 +3,7 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 
 LIBRARY_NAME = libMPWXmlKit
+GNUSTEP_BUILD_DIR = ~/Build
 
 OBJCFLAGS += -Wno-import -fobjc-runtime=gnustep
 
@@ -48,7 +49,8 @@ libMPWXmlKit_OBJC_FILES = \
  MPWXmlAppleProplistGenerator.m\
 MPWXmlArchiver.m MPWXmlAttributes.m\
 MPWXmlGeneratorStream.m\
-MPWXmlParser.m \
+ MPWXmlParser.m \
+ MPWMAXParser.m \
 MPWXmlProplistGenerator.m MPWXmlSaxScanner.m\
 MPWXmlScanner.m \
 MPWXmlUnarchiver.m MPWXmlWrapperArchiver.m\
@@ -66,3 +68,9 @@ libMPWXmlKit_CFLAGS += -Wno-import
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
 
+
+test : libMPWXmlKit tester
+LD_LIBRARY_PATH=/home/gnustep/GNUstep/Library/Libraries:/usr/local/lib:/home/gnustep/Build/obj/ ./GNUstep/testobjectivexml
+
+tester :
+clang -fobjc-runtime=gnustep-1.9 -I../MPWFoundation/.headers/ -I.headers -o GNUstep/testobjectivexml GNUstep/testobjectivexml.m -L/home/gnustep/Build/obj -lMPWXmlKit -lMPWFoundation -lgnustep-base -L/usr/local/lib/ -lobjc

MPWMAXParser.m

@@ -271,15 +271,11 @@ -(BOOL)attributeName:(const char*)nameStart length:(int)nameLen value:(const cha
 return YES;
 }
 if ( highBit ) {
-int i;
-for (i=0;i< valueLen;i++ ) {
-if ( valueStart[i] & 128 ) {
-value = (id)CFStringCreateWithBytes(NULL, (unsigned char*)valueStart, valueLen, (CFStringEncoding)cfDataEncoding, NO);
-valueToRelease=value;
-break;
-}
-}
+ valueToRelease=createNSStringIfAnyHighBitSet(valueStart, valueLen,cfDataEncoding);
 }
+ if ( valueToRelease) {
+ value=valueToRelease;
+ }
 if ( !value ) {
 value = MAKEDATA( valueStart, valueLen );
 }
@@ -966,6 +962,17 @@ -(void)clearAttributes
 [self _setAttributes:nil];
 }
 
+static inline NSString* createNSStringIfAnyHighBitSet( const char *start, long len, long cfDataEncoding ) {
+ for (int i=0;i< len;i++ ) {
+ if ( start[i] & 128 ) {
+ return (id)CFStringCreateWithBytes(NULL, (const unsigned char*)start, len, (CFStringEncoding)cfDataEncoding, NO);
+ // if (!str ) { return YES; }
+ break;
+ }
+ }
+ return nil;
+}
+
 -(BOOL)makeText:(const char*)start length:(long)len firstEntityOffset:(long)entityOffset
 {
 idstringToRelease=nil;
@@ -976,19 +983,13 @@ -(BOOL)makeText:(const char*)start length:(long)len firstEntityOffset:(long)enti
 
 }
  if ( CHARACTERDATAALLOWED ) {
-int i;
-//NSLog(@"allowing characters, tagStackLen: %d and sending to %@",tagStackLen,characterHandler);
-if ( autotranslateUTF8 ) {
-for (i=0;i< len;i++ ) {
-if ( start[i] & 128 ) {
-str = (id)CFStringCreateWithBytes(NULL, (const unsigned char*)start, len, (CFStringEncoding)cfDataEncoding, NO);
-stringToRelease=str;
-//if (!str ) { return YES; }
-break;
-}
-}
+ //NSLog(@"allowing characters, tagStackLen: %d and sending to %@",tagStackLen,characterHandler);
+if ( autotranslateUTF8 ) {
+ stringToRelease=createNSStringIfAnyHighBitSet(start, len,cfDataEncoding);
 }
-if ( !str ) {
+ if ( stringToRelease) {
+ str = stringToRelease;
+ } else {
 str= MAKEDATA( start, len );
 }
 if ( str ) {