warnings down to 43

Author: mpw

MPWMAXParser.h

@@ -88,7 +88,7 @@ typedef id (*XMLIMP6)(id, SEL, id,id,id,id,id,id);
     XMLIMP1                 characterDataAllowed;
     XMLIMP2                 characters,cdata;
     XMLIMP3                 uniqueTagForCString;
-    XMLIMP2                 tagHandlerForPrefix;
+    XMLIMPCHARPLONG         tagHandlerForPrefix;
     XMLIMPCHARPLONG         prefixMapObjectForCString;
 	MPWXMLAttributes*		_attributes;
 
@@ -104,7 +104,7 @@ typedef id (*XMLIMP6)(id, SEL, id,id,id,id,id,id);
 	BOOL					shouldReportNamespacePrefixes, autotranslateUTF8,ignoreCase;
 	BOOL					enforceTagNesting,lastTagWasOpen;
 	BOOL					reportIgnoreableWhitespace,charactersAreSpace;	
-	int						dataEncoding,cfDataEncoding;
+	long					dataEncoding,cfDataEncoding;
 	NSString*				version;
 	const char*				lastGoodPosition;
 	NSMutableData			*buffer;
@@ -145,7 +145,6 @@ objectAccessor_h( NSError, parserError, setParserError  )
 -(void)abortParsing;
 -(id)parseResult;														//	root of the parse-tree constructed (valid after parse is complete)
 -(void)setDelegate:handler;
--(NSError*)parserError;
 
 //---	Configure element(1) messages to be sent for specific elements in a specific namespace (nil for the default namespace)
 //---	Messages will be sent to a specific handler object.  Element names will be assigned numeric tags starting sequentially

MPWMAXParser.m

@@ -40,16 +40,15 @@ @implementation MPWMAXParser
 }
 
 intAccessor( undefinedTagAction, setUndefinedTagAction)
-intAccessor( cfDataEncoding, setCfDataEncoding )
-intAccessor( dataEncoding, _setDataEncoding )
+longAccessor( cfDataEncoding, setCfDataEncoding )
+longAccessor( dataEncoding, _setDataEncoding )
 idAccessor( defaultNamespaceHandler, setDefaultNamespaceHandler	)
 boolAccessor( reportIgnoreableWhitespace, setReportIgnoreableWhitespace )
 boolAccessor( ignoreCase, setIgnoreCase )
 scalarAccessor( NSInteger, maxDepthAllowed, setMaxDepthAllowed )
 objectAccessor( NSData, buffer, setBuffer )
 objectAccessor( NSURL, url, setUrl )
 
-#define MAKEDATA( start, theLength )   initDataBytesLength( getData( dataCache, @selector(getObject)),@selector(reInitWithData:bytes:length:), data, start , theLength )
 
 #define POPTAGNORELEASE						(((NSXMLElementInfo*)_elementStack)[--tagStackLen].elementName)
 // #define POPTAG						( [POPTAGNORELEASE release])
@@ -95,7 +94,7 @@ @implementation MPWMAXParser
 
 
 
--(void)setDataEncoding:(int)newEncoding
+-(void)setDataEncoding:(long)newEncoding
 {
 	[self _setDataEncoding:newEncoding];
 #ifndef WINDOWS	
@@ -147,7 +146,7 @@ -(void)setDataEncoding:(int)newEncoding
 //	NSLog(@"after setHandler");
 //	[pool release];
 	autotranslateUTF8=YES;
-        tagHandlerForPrefix=[self methodForSelector:@selector(handlerForPrefix:length:)];
+    tagHandlerForPrefix=(XMLIMPCHARPLONG)[self methodForSelector:@selector(handlerForPrefix:length:)];
     }
 	return self;
 }
@@ -171,7 +170,7 @@ -(void)setDataEncoding:(int)newEncoding
 }
 
 
-static inline id currentChildrenNoCheck( NSXMLElementInfo *base, int offset , MPWObjectCache *attributeCache ) {
+static inline id currentChildrenNoCheck( NSXMLElementInfo *base, long offset , MPWObjectCache *attributeCache ) {
 	id children=nil;
 	NSXMLElementInfo *info=&base[offset-1];
 	children=info->children;
@@ -251,7 +250,7 @@ -(MPWTagHandler*)handlerForPrefix:(const char*)prefixString length:(long)prefixL
 		[self rebuildPrefixHandlerMap];
 	}
 //	NSLog(@"getting handler for prefix: '%.*s'",prefixLen,prefixString);
-    handler = prefixMapObjectForCString( prefix2HandlerMap, @selector(objectForCString:length:), prefixString, prefixLen);
+    handler = prefixMapObjectForCString( prefix2HandlerMap, @selector(objectForCString:length:), (char*)prefixString, prefixLen);
 //	handler = [prefix2HandlerMap objectForCString:(char*)prefixString length:prefixLen];
 	if ( !handler ) {
 		handler=defaultNamespaceHandler;
@@ -276,7 +275,7 @@ -(BOOL)attributeName:(const char*)nameStart length:(int)nameLen value:(const cha
 		int i;
 		for (i=0;i< valueLen;i++ ) {
 			if ( valueStart[i] & 128 ) {
-				value = (id)CFMakeCollectable(CFStringCreateWithBytes(NULL, (unsigned char*)valueStart, valueLen, cfDataEncoding, NO));
+				value = (id)CFStringCreateWithBytes(NULL, (unsigned char*)valueStart, valueLen, (CFStringEncoding)cfDataEncoding, NO);
 				valueToRelease=value;
 				break;
 			}
@@ -295,7 +294,7 @@ -(BOOL)attributeName:(const char*)nameStart length:(int)nameLen value:(const cha
         }
         @try {
             if ( !isNamespace) {
-                handler=tagHandlerForPrefix(self,@selector(handlerForPrefix:length:), nameStart, namespaceLen);
+                handler=tagHandlerForPrefix(self,@selector(handlerForPrefix:length:), (char*)nameStart, namespaceLen);
             }
         } @catch (id e) {
             NSLog(@"---- raised in getting handler for prefix: %@",e);
@@ -420,7 +419,7 @@ -(void)rebuildPrefixHandlerMap
 		}
 	}
 	[self setPrefix2HandlerMap:[[[MPWSmallStringTable alloc] initWithKeys:activePrefixes values:handlers] autorelease]];
-    prefixMapObjectForCString=[prefix2HandlerMap methodForSelector:@selector(objectForCString:length:)];
+    prefixMapObjectForCString=(XMLIMPCHARPLONG)[prefix2HandlerMap methodForSelector:@selector(objectForCString:length:)];
 	[pool release];
 }
 
@@ -832,7 +831,10 @@ -(IMP)methodForSelector:(SEL)sel forReceiver:receiver withDefault:(IMP)defaultMe
 	if ( [receiver respondsToSelector:sel] ) {
 		IMP theMethod = [receiver methodForSelector:sel];
 		if ( !unknownMethod ) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundeclared-selector"
 			unknownMethod = [self methodForSelector:@selector(thisOneDoesntExistAtAll)];
+#pragma clang diagnostic pop
 		}
 		if ( theMethod != (IMP)NULL  && theMethod != unknownMethod) {
 			result = theMethod;
@@ -980,7 +982,7 @@ -(BOOL)makeText:(const char*)start length:(long)len firstEntityOffset:(long)enti
 		if ( autotranslateUTF8 ) {
 			for (i=0;i< len;i++ ) {
 				if ( start[i] & 128 ) {
-					str = (id)CFMakeCollectable(CFStringCreateWithBytes(NULL, (const unsigned char*)start, len, cfDataEncoding, NO));
+					str = (id)CFStringCreateWithBytes(NULL, (const unsigned char*)start, len, (CFStringEncoding)cfDataEncoding, NO);
 					stringToRelease=str;
 //					if (!str ) { return YES; }
 					break;
@@ -1113,6 +1115,7 @@ -(BOOL)makeEntityRef:(const xmlchar*)start length:(int)len
 		id name=MAKEDATA(start,len);
 //		NSLog(@"entity: '%@'",name);
 		if ( [documentHandler respondsToSelector:@selector(parser:resolveExternalEntityName:systemID:)] ) {
+            // FIXME:  this actually returns an NSData
 			[documentHandler parser:(NSXMLParser*)self resolveExternalEntityName:name systemID:nil];
 		}
 	}
@@ -1237,14 +1240,14 @@ -(BOOL)parseFragment:(NSData*)nextData
 	lastGoodPosition=[nextData bytes];
 	scanComplete=[scanner parse:nextData];
 	if ( !scanComplete ) {
-		int remainderOffset=(char*)lastGoodPosition-(char*)[nextData bytes];
-		int remainderLength=[nextData length]-remainderOffset;
+		long remainderOffset=(char*)lastGoodPosition-(char*)[nextData bytes];
+		long remainderLength=[nextData length]-remainderOffset;
 		if ( remainderLength >0 ) {
 //			NSLog(@"scan failure with offset: %d length: %d at '%c'",remainderOffset,remainderLength,*lastGoodPosition);
 			[self setBuffer:[NSMutableData dataWithBytes:lastGoodPosition length:remainderLength]];
 		} else {
 			[self setBuffer:nil];			//  must clear buffer if there was no remainder
-			NSLog(@"non-positive remainder length: %d",remainderLength);
+//			NSLog(@"non-positive remainder length: %d",(int)remainderLength);
 		}
 	} else {
 		[self setBuffer:nil];			//  must clear buffer if there was no remainder
@@ -1394,7 +1397,7 @@ -(void)abortParsing
 	if ( currentElement && tagStackLen > 0 && currentElement->start && currentElement->end > currentElement->start ) {
 		const char * start = currentElement->start;
 		const char * end = currentElement->end;
-		int len=end-start;
+		long len=end-start;
 		return MAKEDATA( start , len );
 	} else {
 		return nil;
@@ -1436,10 +1439,10 @@ -(void)abortParsing
 	if ( [children isLeaf] ) {
 		result=[[children combinedText] retain];
 		if (!result ) {
-			result=[attrs copy];
+			result=[(id)attrs copy];
 		}
 	} else {
-		result=[attrs copy];
+		result=[(id)attrs copy];
 		[children copyKeysTo:result];
 	}
 //	NSLog(@"tag %@ buildDOMWithChildren: %@ from children: %@ ",[self currentTag], result,children);

MPWMAXParser_private.h

@@ -121,8 +121,8 @@ objectAccessor_h( NSError, parserError, setParserError )
 
 -(BOOL)makeText:(const char*)start length:(long)len firstEntityOffset:(long)entityOffset;
 -(void)pushObject:anObject forKey:aKey withNamespace:aNamespace;
--(int)dataEncoding;
--(void)setDataEncoding:(int)newEncoding;
+-(long)dataEncoding;
+-(void)setDataEncoding:(long)newEncoding;
 -(BOOL)parseSource:(NSEnumerator*)source;
 -htmlAttributeLowerCaseNamed:(NSString*)lowerCaseAttributeName;
 -(BOOL)handleMetaTag;

MPWXmlAttributes.h

@@ -66,5 +66,6 @@ THE POSSIBILITY OF SUCH DAMAGE.  */
 -(void)setValue:anObject forAttribute:aKey;
 -(void)removeAllObjects;
 -(void)pop:(long)n;
+-(void)copyKeysTo:(MPWXMLAttributes*)copy;
 
 @end

SaxDocumentHandler.h

@@ -38,8 +38,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
 - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName;
 -(void)parser:(NSXMLParser *)aParser didStartMappingPrefix:aPrefix toURI: uri;
 -(void)parser:(NSXMLParser *)aParser didEndMappingPrefix:aPrefix;
--(void)parser:(NSXMLParser *)aParser resolveExternalEntityName:name systemID:systemId;
-- (void)parser:(NSXMLParser *)parser foundProcessingInstructionWithTarget:(NSString *)target data:(NSString *)data;
+-(NSData *)parser:(NSXMLParser *)aParser resolveExternalEntityName:(NSString *)name systemID:(NSString *)systemId;
+-(void)parser:(NSXMLParser *)parser foundProcessingInstructionWithTarget:(NSString *)target data:(NSString *)data;
 
 //-(void)processingInstructionTarget:piTarget data:piData;
 //-(void)cdata:cdata;