removed macro argument name collision in MAKEDATA in different place, 105 total

Author: mpw

MPWMAXParser_private.h

@@ -44,7 +44,7 @@ typedef struct _NSXMLElementInfo {
 #if DEOPTIMIZE_ALLOCATION
 #define MAKEDATA( dataStart, dataLength ) [NSData dataWithBytes:dataStart length:dataLength]
 #else
-#define MAKEDATA( start, length ) initDataBytesLength( getData( dataCache, @selector(getObject)),@selector(reInitWithData:bytes:length:), data, start , length )
+#define MAKEDATA( start, lengthBytes ) initDataBytesLength( getData( dataCache, @selector(getObject)),@selector(reInitWithData:bytes:length:), data, start , lengthBytes )
 #endif
 
 

MPWXmlUnarchiver.m

@@ -555,7 +555,7 @@ -(void)parser:aParser foundCharacters:(MPWSubData*)chars
  if ( dataLen>0 ) {
 // NSLog(@"characters: expecting dataLen = %d, got %d '%@'",dataLen,[chars length],chars);
  if ( [chars isEqual:@">]]>"] ) {
- chars=[NSData dataWithBytes:"]]>" length:3];
+ chars=(MPWSubData*)[NSData dataWithBytes:"]]>" length:3];
  }
  dataLen-=[chars length];
  if ( currentValue ) {

MPWXmlWrapperArchiver.m

@@ -78,7 +78,8 @@ -(void)dealloc
 
 +testSelectors
 {
- return [NSArray arrayWithObjects:nil];
+ return @[
+ ];
 }
 
 

XmlScannerPseudoMacro.h

@@ -162,7 +162,7 @@ static int scanXml(
 //NSLog(@"start scan with client data %x",clientData);
  while ( currentPtr < endPtr ) {
  const xmlchar *currentString = currentPtr;
- int spaceOffset=0;
+ long spaceOffset=0;
  ProcessFunc currentCallback;
 
 //--- scan up to the beginning of a tag (the initial '<' )