Merge branch 'master' of http://github.com/schwa/TouchXML

Erik Aigner · Erik Aigner · commit 9cb0da6a623c · 2010-08-21T12:55:15.000+02:00
diff --git a/Source/CXMLDocument.m b/Source/CXMLDocument.m
@@ -42,6 +42,7 @@ @implementation CXMLDocument
 
 - (id)initWithXMLString:(NSString *)inString options:(NSUInteger)inOptions error:(NSError **)outError
 {
+#pragma unused (inOptions)
 if ((self = [super init]) != NULL)
 	{
 	NSError *theError = NULL;
@@ -97,6 +98,7 @@ - (id)initWithData:(NSData *)inData options:(NSUInteger)inOptions error:(NSError
 
 - (id)initWithData:(NSData *)inData encoding:(NSStringEncoding)encoding options:(NSUInteger)inOptions error:(NSError **)outError
 {
+#pragma unused (inOptions)
 if ((self = [super init]) != NULL)
 	{
 	NSError *theError = NULL;
@@ -208,6 +210,7 @@ - (NSData *)XMLData
 
 - (NSData *)XMLDataWithOptions:(NSUInteger)options
 {
+#pragma unused (options)
 xmlChar *theBuffer = NULL;
 int theBufferSize = 0;
 xmlDocDumpMemory((xmlDocPtr)self->_node, &theBuffer, &theBufferSize);
diff --git a/Source/CXMLNode.m b/Source/CXMLNode.m
@@ -64,6 +64,7 @@ - (void)dealloc
 
 - (id)copyWithZone:(NSZone *)zone;
 {
+#pragma unused (zone)
 xmlNodePtr theNewNode = xmlCopyNode(_node, 1);
 CXMLNode *theNode = [[[self class] alloc] initWithLibXMLNode:theNewNode freeOnDealloc:YES];
 theNewNode->_private = theNode;
@@ -299,7 +300,9 @@ - (NSString *)XMLString
 
 - (NSString *)XMLStringWithOptions:(NSUInteger)options
 {
-NSMutableData *theData = [[NSMutableData alloc] init];
+#pragma unused (options)
+
+NSMutableData *theData = [[[NSMutableData alloc] init] autorelease];
 
 xmlOutputBufferPtr theOutputBuffer = xmlOutputBufferCreateIO(MyXmlOutputWriteCallback, MyXmlOutputCloseCallback, theData, NULL);
 
@@ -369,7 +372,5 @@ static int MyXmlOutputWriteCallback(void * context, const char * buffer, int len
 
 static int MyXmlOutputCloseCallback(void * context)
 {
-NSMutableData *theData = context;
-[theData release];
 return(0);
 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ @implementation CXMLDocument`
`42`	`42`
`43`	`43`	`- (id)initWithXMLString:(NSString )inString options:(NSUInteger)inOptions error:(NSError *)outError`
`44`	`44`	`{`
	`45`	`+#pragma unused (inOptions)`
`45`	`46`	`if ((self = [super init]) != NULL)`
`46`	`47`	`{`
`47`	`48`	`NSError *theError = NULL;`
`@@ -97,6 +98,7 @@ - (id)initWithData:(NSData *)inData options:(NSUInteger)inOptions error:(NSError`
`97`	`98`
`98`	`99`	`- (id)initWithData:(NSData )inData encoding:(NSStringEncoding)encoding options:(NSUInteger)inOptions error:(NSError *)outError`
`99`	`100`	`{`
	`101`	`+#pragma unused (inOptions)`
`100`	`102`	`if ((self = [super init]) != NULL)`
`101`	`103`	`{`
`102`	`104`	`NSError *theError = NULL;`
`@@ -208,6 +210,7 @@ - (NSData *)XMLData`
`208`	`210`
`209`	`211`	`- (NSData *)XMLDataWithOptions:(NSUInteger)options`
`210`	`212`	`{`
	`213`	`+#pragma unused (options)`
`211`	`214`	`xmlChar *theBuffer = NULL;`
`212`	`215`	`int theBufferSize = 0;`
`213`	`216`	`xmlDocDumpMemory((xmlDocPtr)self->_node, &theBuffer, &theBufferSize);`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ - (void)dealloc`
`64`	`64`
`65`	`65`	`- (id)copyWithZone:(NSZone *)zone;`
`66`	`66`	`{`
	`67`	`+#pragma unused (zone)`
`67`	`68`	`xmlNodePtr theNewNode = xmlCopyNode(_node, 1);`
`68`	`69`	`CXMLNode *theNode = [[[self class] alloc] initWithLibXMLNode:theNewNode freeOnDealloc:YES];`
`69`	`70`	`theNewNode->_private = theNode;`
`@@ -299,7 +300,9 @@ - (NSString *)XMLString`
`299`	`300`
`300`	`301`	`- (NSString *)XMLStringWithOptions:(NSUInteger)options`
`301`	`302`	`{`
`302`		`-NSMutableData *theData = [[NSMutableData alloc] init];`
	`303`	`+#pragma unused (options)`
	`304`	`+`
	`305`	`+NSMutableData *theData = [[[NSMutableData alloc] init] autorelease];`
`303`	`306`
`304`	`307`	`xmlOutputBufferPtr theOutputBuffer = xmlOutputBufferCreateIO(MyXmlOutputWriteCallback, MyXmlOutputCloseCallback, theData, NULL);`
`305`	`308`
`@@ -369,7 +372,5 @@ static int MyXmlOutputWriteCallback(void * context, const char * buffer, int len`
`369`	`372`
`370`	`373`	`static int MyXmlOutputCloseCallback(void * context)`
`371`	`374`	`{`
`372`		`-NSMutableData *theData = context;`
`373`		`-[theData release];`
`374`	`375`	`return(0);`
`375`	`376`	`}`