warnings down to 72

mpw · mpw · commit 84a5bf37f39f · 2018-10-19T16:16:46.000+02:00
diff --git a/MPWBridgeReader.m b/MPWBridgeReader.m
@@ -39,7 +39,7 @@ +(void)parseBridgeDict:aDict forContext:aContext
 	id pool=[NSAutoreleasePool new];
 	id reader = [[[self alloc] initWithContext:aContext] autorelease];
 	[reader parse:aDict];
-	NSLog(@"%d total elements",[reader count]);
+//	NSLog(@"%d total elements",(int)[reader count]);
 	[pool release];
 }
 
diff --git a/MPWMASONParser.m b/MPWMASONParser.m
@@ -58,7 +58,7 @@ -(void)pushTag:(id)aTag
 	
 }
 
--(NSString*)makeRetainedJSONStringStart:(const char*)start length:(int)len
+-(NSString*)makeRetainedJSONStringStart:(const char*)start length:(long)len
 {
 	NSString *curstr;
 	if ( commonStrings  ) {
diff --git a/MPWMAXParser.h b/MPWMAXParser.h
@@ -125,6 +125,7 @@ typedef id (*XMLIMP6)(id, SEL, id,id,id,id,id,id);
 -(BOOL)parse:(NSData*)xmlData;										//  process the XML data passed, start sending element(1) or tag(2) 
 																	//  messages to the configured handlers according to the 
 																	//  NSMAXParserDelegate 'protocol' and message patterns.
+-(instancetype)initWithData:(NSData*)data;
 -(BOOL)parse;
 -(BOOL)parseDataFromURL:(NSURL*)url;
 -(id)parsedDataFromURL:(id)theUrlOrString;
diff --git a/MPWMAXParser.m b/MPWMAXParser.m
@@ -121,7 +121,7 @@ -(void)setDataEncoding:(int)newEncoding
    dataCache=[[MPWObjectCache alloc] initWithCapacity:90 class:[MPWSubData class]];
     [dataCache setUnsafeFastAlloc:YES];
     getData = (XMLIMP0)[dataCache getObjectIMP];
-    initDataBytesLength=(XMLIMP3)[MPWSubData
+    initDataBytesLength=(XMLIMP1CharP1L1)[MPWSubData
                     instanceMethodForSelector:@selector(reInitWithData:bytes:length:)];
 	uniqueTagForCString=(XMLIMP3)[self methodForSelector: @selector(getTagForCString:length:)];
     [self _growTagStack:INITIALTAGSTACKDEPTH];
@@ -856,7 +856,7 @@ -(IMP)boolMethodForSelector:(SEL)sel defaultValue:(BOOL)defaultValue forReceiver
 }
 
 
--(void)_growTagStack:(unsigned)newCapacity
+-(void)_growTagStack:(long)newCapacity
 {
 //    NSLog(@"growStack to: %d",newCapacity);
 	void *newStack = ALLOC_POINTERS( (newCapacity+10)* sizeof (NSXMLElementInfo)  );
@@ -874,17 +874,17 @@ -(void)_growTagStack:(unsigned)newCapacity
 -(void)setDelegate:handler
 {
     [self _setDocumentHandler:handler];
-    beginElement = [self defaultedVoidMethodForSelector:BEGINELEMENTSELECTOR forReceiver:handler];
+    beginElement = (XMLIMP5)[self defaultedVoidMethodForSelector:BEGINELEMENTSELECTOR forReceiver:handler];
 //	NSLog(@"beginElement: %x for %@",beginElement,NSStringFromSelector(BEGINELEMENTSELECTOR));
-    endElement = [self defaultedVoidMethodForSelector:ENDELEMENTSELECTOR  forReceiver:handler];
+    endElement = (XMLIMP4)[self defaultedVoidMethodForSelector:ENDELEMENTSELECTOR  forReceiver:handler];
 //	NSLog(@"endElementSelector: %@",NSStringFromSelector(ENDELEMENTSELECTOR));
 
-	characterDataAllowed = [self boolMethodForSelector:@selector(characterDataAllowed:) defaultValue:YES forReceiver:self ];
+	characterDataAllowed = (XMLIMP1)[self boolMethodForSelector:@selector(characterDataAllowed:) defaultValue:YES forReceiver:self ];
 
 	[self setCharacterHandlerWithDocumentHandler:handler];
 
-    characters = [self defaultedVoidMethodForSelector:CHARACTERSSELECTOR forReceiver:characterHandler];
-    cdata = [self defaultedVoidMethodForSelector:CDATASELECTOR forReceiver:characterHandler];
+    characters = (XMLIMP2)[self defaultedVoidMethodForSelector:CHARACTERSSELECTOR forReceiver:characterHandler];
+    cdata = (XMLIMP2)[self defaultedVoidMethodForSelector:CDATASELECTOR forReceiver:characterHandler];
 //    NSLog(@"document-handler now %@",documentHandler);
 }
 
diff --git a/MPWMAXParser_private.h b/MPWMAXParser_private.h
@@ -31,8 +31,8 @@ typedef struct _NSXMLElementInfo {
 	const char	*start;
 	const char  *end;
 	BOOL		isIncomplete;
-	int			integerTag;
-    int         fullyQualifiedLen;
+	long			integerTag;
+    long         fullyQualifiedLen;
     MPWTagAction *action;
     MPWTagHandler *handler;
 } NSXMLElementInfo;
@@ -96,7 +96,7 @@ typedef struct _NSXMLElementInfo {
 
 objectAccessor_h( NSError, parserError, setParserError )
 
--(void)_growTagStack:(unsigned)newCapacity;
+-(void)_growTagStack:(long)newCapacity;
 -currentTag;
 -(void)pushTag:aTag;
 -(void)popTag;
diff --git a/MPWXmlAppleProplistReader.h b/MPWXmlAppleProplistReader.h
@@ -37,7 +37,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
 }
 
 
--realElement:(const char*)start length:(int)len;
+-realElement:(const char*)start length:(long)len;
 -integerElement:(id <NSXMLAttributes>)children attributes:(id <NSXMLAttributes>)attrs parser:(MPWMAXParser*)parser;
 
 @end
diff --git a/MPWXmlAppleProplistReader.m b/MPWXmlAppleProplistReader.m
@@ -70,7 +70,7 @@ @implementation MPWXmlAppleProplistReader
 	return [[NSDictionary alloc] initWithObjects:values forKeys:keys count:count/2];
 }
 
--integerElementAtPtr:(const char*)start length:(int)len
+-integerElementAtPtr:(const char*)start length:(long)len
 {
 	int val=0;
 	int sign=1;
@@ -89,7 +89,7 @@ @implementation MPWXmlAppleProplistReader
 	return (id)CFNumberCreate( allocator, kCFNumberSInt32Type, &val );
 }
 
--realElement:(const char*)start length:(int)len
+-realElement:(const char*)start length:(long)len
 {
 	double val=0;
 	double sign=1;
diff --git a/MPWXmlArchiver.m b/MPWXmlArchiver.m
@@ -386,7 +386,7 @@ -(void)encodeXmlOn:aCoder withName:(const char*)name
 
 -(void)encodeWithXmlCoder:(NSCoder*)aCoder
 {
-    [self encodeWithCoder:aCoder];
+    [(id)self encodeWithCoder:aCoder];
 }
 
 @end
diff --git a/MPWXmlFastInfosetParser.m b/MPWXmlFastInfosetParser.m
@@ -200,7 +200,7 @@ -(void)parseElement:(unsigned char)startByte
 				namespace = [self parseNamespace];
 			}
 			name=[self parseNameStartingOnFirstBit];
-			[documentHandler parser:PARSERSELF didStartElement:name namespaceURI:nil qualifiedName:nil attributes:nil];
+            [documentHandler parser:PARSERSELF didStartElement:name namespaceURI:nil qualifiedName:nil attributes:@{}];
 			[self parseElementContent];
 			[documentHandler parser:PARSERSELF didEndElement:name namespaceURI:nil qualifiedName:nil ];
 
@@ -273,7 +273,7 @@ +(void)testVerifyFI
 
 +(NSArray*)testSelectors
 {
-    return [NSArray arrayWithObjects:
+    return @[
  #if 0 
 		@"testVerifyFI",
 		@"testBasicSaxParse",
@@ -284,7 +284,7 @@ +(NSArray*)testSelectors
         @"testEmptyElementWithAttribute",
         @"testNamespaceParsingMPWXML",
 #endif		
-        nil];
+        ];
 }
 
 
diff --git a/MPWXmlGeneratorStream.h b/MPWXmlGeneratorStream.h
@@ -69,7 +69,6 @@ typedef void (^XmlGeneratorBlock)(MPWXmlGeneratorStream* );
 -(void)indent;
 -(void)outdent;
 -(void)cr;
--(void)writeCData:(NSData*)data;
 -(void)writeNSDataContent:(NSData*)data;
 -(void)writeContent:anObject;
 -(void)setShouldIndent:(BOOL)should;
diff --git a/MPWXmlParser.m b/MPWXmlParser.m
@@ -153,7 +153,7 @@ -(BOOL)attributeName:(const char*)nameStart length:(long)nameLen value:(const ch
 -(BOOL)beginElement:(const char*)fullyQualifedPtr length:(long)len nameLen:(long)fullyQualifiedLen namespaceLen:(long)namespaceLen
 {
 	const char *tagStartPtr=fullyQualifedPtr;
-	int tagLen=fullyQualifiedLen;
+	long tagLen=fullyQualifiedLen;
     id tag=nil;
     BOOL isEmpty=NO;
 //  NSString *namespacePrefixTag=nil;
@@ -166,10 +166,10 @@ -(BOOL)beginElement:(const char*)fullyQualifedPtr length:(long)len nameLen:(long
 		currentElement->fullyQualifiedLen = fullyQualifiedLen;
 	}
     
-	if ( NO && charactersAreSpace &&  !reportIgnoreableWhitespace) {
-        //		NSLog(@"characters before begin: %.*s were space",nameLen,start);
-		[self flushPureSpace];
-    }
+//    if ( NO && charactersAreSpace &&  !reportIgnoreableWhitespace) {
+//                NSLog(@"characters before begin: %.*s were space",nameLen,start);
+//        [self flushPureSpace];
+//    }
     
 	lastTagWasOpen=YES;
 	charactersAreSpace=YES;
diff --git a/MPWXmlProplistGenerator.m b/MPWXmlProplistGenerator.m
@@ -30,6 +30,13 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 
 #import "MPWXmlProplistGenerator.h"
 
+@interface NSObject(xmlProplist)
+
+-(void)generateXmlProplistOnto:aStream;
+
+@end
+
+
 @implementation MPWXmlProplistGenerator
 
 static const char *array="array";
diff --git a/MPWXmlWrapperUnarchiver.m b/MPWXmlWrapperUnarchiver.m
@@ -86,7 +86,8 @@ -(void)dealloc
 }
 +testSelectors
 {
-    return [NSArray arrayWithObjects:nil];
+    return @[
+             ];
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ +(void)parseBridgeDict:aDict forContext:aContext`
`39`	`39`	`id pool=[NSAutoreleasePool new];`
`40`	`40`	`id reader = [[[self alloc] initWithContext:aContext] autorelease];`
`41`	`41`	`[reader parse:aDict];`
`42`		`- NSLog(@"%d total elements",[reader count]);`
	`42`	`+// NSLog(@"%d total elements",(int)[reader count]);`
`43`	`43`	`[pool release];`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ -(void)pushTag:(id)aTag`
`58`	`58`
`59`	`59`	`}`
`60`	`60`
`61`		`--(NSString)makeRetainedJSONStringStart:(const char)start length:(int)len`
	`61`	`+-(NSString)makeRetainedJSONStringStart:(const char)start length:(long)len`
`62`	`62`	`{`
`63`	`63`	`NSString *curstr;`
`64`	`64`	`if ( commonStrings ) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ THE POSSIBILITY OF SUCH DAMAGE.`
`37`	`37`	`}`
`38`	`38`
`39`	`39`
`40`		`--realElement:(const char*)start length:(int)len;`
	`40`	`+-realElement:(const char*)start length:(long)len;`
`41`	`41`	`-integerElement:(id <NSXMLAttributes>)children attributes:(id <NSXMLAttributes>)attrs parser:(MPWMAXParser*)parser;`
`42`	`42`
`43`	`43`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ @implementation MPWXmlAppleProplistReader`
`70`	`70`	`return [[NSDictionary alloc] initWithObjects:values forKeys:keys count:count/2];`
`71`	`71`	`}`
`72`	`72`
`73`		`--integerElementAtPtr:(const char*)start length:(int)len`
	`73`	`+-integerElementAtPtr:(const char*)start length:(long)len`
`74`	`74`	`{`
`75`	`75`	`int val=0;`
`76`	`76`	`int sign=1;`
`@@ -89,7 +89,7 @@ @implementation MPWXmlAppleProplistReader`
`89`	`89`	`return (id)CFNumberCreate( allocator, kCFNumberSInt32Type, &val );`
`90`	`90`	`}`
`91`	`91`
`92`		`--realElement:(const char*)start length:(int)len`
	`92`	`+-realElement:(const char*)start length:(long)len`
`93`	`93`	`{`
`94`	`94`	`double val=0;`
`95`	`95`	`double sign=1;`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ -(void)encodeXmlOn:aCoder withName:(const char*)name`
`386`	`386`
`387`	`387`	`-(void)encodeWithXmlCoder:(NSCoder*)aCoder`
`388`	`388`	`{`
`389`		`- [self encodeWithCoder:aCoder];`
	`389`	`+ [(id)self encodeWithCoder:aCoder];`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`@end`