Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed multiple warnings. #61

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed multiple warnings. #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9195bfa
Fixed warnings about implicit conversion from nullable pointer to non…
May 19, 2016
969f528
Fixed warnings about no explicit ownership when compiling with -Wexpl…
May 19, 2016
0dc5997
Fixed warning about declaration shadowing a local variable when compi…
May 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions KissXML/DDXMLDocument.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ typedef NSUInteger DDXMLDocumentContentKind;
{
}

- (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSError **)error;
//- (id)initWithContentsOfURL:(NSURL *)url options:(NSUInteger)mask error:(NSError **)error;
- (id)initWithData:(NSData *)data options:(NSUInteger)mask error:(NSError **)error;
- (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSError * __autoreleasing*)error;
//- (id)initWithContentsOfURL:(NSURL *)url options:(NSUInteger)mask error:(NSError * __autoreleasing*)error;
- (id)initWithData:(NSData *)data options:(NSUInteger)mask error:(NSError * __autoreleasing*)error;
//- (id)initWithRootElement:(DDXMLElement *)element;

//+ (Class)replacementClassForClass:(Class)cls;
Expand Down
4 changes: 2 additions & 2 deletions KissXML/DDXMLDocument.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ - (id)initWithPrimitive:(xmlKindPtr)kindPtr owner:(DDXMLNode *)inOwner
* Returns an initialized DDXMLDocument object, or nil if initialization fails
* because of parsing errors or other reasons.
**/
- (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSError **)error
- (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSError * __autoreleasing*)error
{
return [self initWithData:[string dataUsingEncoding:NSUTF8StringEncoding]
options:mask
Expand All @@ -75,7 +75,7 @@ - (id)initWithXMLString:(NSString *)string options:(NSUInteger)mask error:(NSErr
* Returns an initialized DDXMLDocument object, or nil if initialization fails
* because of parsing errors or other reasons.
**/
- (id)initWithData:(NSData *)data options:(NSUInteger)mask error:(NSError **)error
- (id)initWithData:(NSData *)data options:(NSUInteger)mask error:(NSError * __autoreleasing*)error
{
if (data == nil || [data length] == 0)
{
Expand Down
2 changes: 1 addition & 1 deletion KissXML/DDXMLElement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- (id)initWithName:(NSString *)name;
- (id)initWithName:(NSString *)name URI:(NSString *)URI;
- (id)initWithName:(NSString *)name stringValue:(NSString *)string;
- (id)initWithXMLString:(NSString *)string error:(NSError **)error;
- (id)initWithXMLString:(NSString *)string error:(NSError * __autoreleasing*)error;

#pragma mark --- Elements by name ---

Expand Down
3 changes: 1 addition & 2 deletions KissXML/DDXMLElement.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ - (id)initWithName:(NSString *)name stringValue:(NSString *)string
return result;
}

- (id)initWithXMLString:(NSString *)string error:(NSError **)error
- (id)initWithXMLString:(NSString *)string error:(NSError * __autoreleasing*)error
{
DDXMLDocument *doc = [[DDXMLDocument alloc] initWithXMLString:string options:0 error:error];
if (doc == nil)
Expand Down Expand Up @@ -247,7 +247,6 @@ - (NSArray *)elementsForLocalName:(NSString *)localName URI:(NSString *)uri
}
else
{
NSString *prefix;
NSString *realLocalName;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix is also covered by PR #39 but we don't need an another variable for that.


[DDXMLNode getPrefix:&prefix localName:&realLocalName forName:localName];
Expand Down
6 changes: 3 additions & 3 deletions KissXML/DDXMLNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ enum {

#pragma mark --- XPath/XQuery ---

- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error;
//- (NSArray *)objectsForXQuery:(NSString *)xquery constants:(NSDictionary *)constants error:(NSError **)error;
//- (NSArray *)objectsForXQuery:(NSString *)xquery error:(NSError **)error;
- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError * __autoreleasing*)error;
//- (NSArray *)objectsForXQuery:(NSString *)xquery constants:(NSDictionary *)constants error:(NSError * __autoreleasing*)error;
//- (NSArray *)objectsForXQuery:(NSString *)xquery error:(NSError * __autoreleasing*)error;

@end
12 changes: 6 additions & 6 deletions KissXML/DDXMLNode.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ - (NSString *)URI
return nil;
}

+ (void)getHasPrefix:(BOOL *)hasPrefixPtr localName:(NSString **)localNamePtr forName:(NSString *)name
+ (void)getHasPrefix:(BOOL *)hasPrefixPtr localName:(NSString * __autoreleasing*)localNamePtr forName:(NSString *)name
{
// This is a private/internal method

Expand All @@ -1051,7 +1051,7 @@ + (void)getHasPrefix:(BOOL *)hasPrefixPtr localName:(NSString **)localNamePtr fo
}
}

+ (void)getPrefix:(NSString **)prefixPtr localName:(NSString **)localNamePtr forName:(NSString *)name
+ (void)getPrefix:(NSString * __autoreleasing*)prefixPtr localName:(NSString * __autoreleasing*)localNamePtr forName:(NSString *)name
{
// This is a private/internal method

Expand Down Expand Up @@ -1194,7 +1194,7 @@ - (NSString *)XMLStringWithOptions:(NSUInteger)options
#pragma mark XPath/XQuery
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error
- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError * __autoreleasing*)error
{
#if DDXML_DEBUG_MEMORY_ISSUES
DDXMLNotZombieAssert();
Expand Down Expand Up @@ -2890,14 +2890,14 @@ - (NSString *)canonicalXMLStringPreservingComments:(BOOL)comments {

// #pragma mark XPath/XQuery

- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error {
- (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError * __autoreleasing*)error {
return [NSArray array];
}

- (NSArray *)objectsForXQuery:(NSString *)xquery constants:(NSDictionary *)constants error:(NSError **)error {
- (NSArray *)objectsForXQuery:(NSString *)xquery constants:(NSDictionary *)constants error:(NSError * __autoreleasing*)error {
return [NSArray array];
}
- (NSArray *)objectsForXQuery:(NSString *)xquery error:(NSError **)error {
- (NSArray *)objectsForXQuery:(NSString *)xquery error:(NSError * __autoreleasing*)error {
return [NSArray array];
}

Expand Down
42 changes: 21 additions & 21 deletions KissXML/Private/DDXMLPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@

// We can't rely solely on NSAssert, because many developers disable them for release builds.
// Our API contract requires us to keep these assertions intact.
#define DDXMLAssert(condition, desc, ...) \
do{ \
if(!(condition)) { \
[[NSAssertionHandler currentHandler] handleFailureInMethod:_cmd \
object:self \
file:[NSString stringWithUTF8String:__FILE__] \
lineNumber:__LINE__ \
description:(desc), ##__VA_ARGS__]; \
} \
#define DDXMLAssert(condition, desc, ...) \
do{ \
if(!(condition)) { \
[[NSAssertionHandler currentHandler] handleFailureInMethod:_cmd \
object:self \
file:@__FILE__ \
lineNumber:__LINE__ \
description:(desc), ##__VA_ARGS__]; \
} \
}while(NO)


// Create assertion to ensure xml node is not a zombie.
#if DDXML_DEBUG_MEMORY_ISSUES
#define DDXMLNotZombieAssert() \
do{ \
if(DDXMLIsZombie(genericPtr, self)) { \
NSString *desc = @"XML node is a zombie - It's parent structure has been freed!"; \
[[NSAssertionHandler currentHandler] handleFailureInMethod:_cmd \
object:self \
file:[NSString stringWithUTF8String:__FILE__] \
lineNumber:__LINE__ \
description:desc]; \
} \
#define DDXMLNotZombieAssert() \
do{ \
if(DDXMLIsZombie(genericPtr, self)) { \
NSString *desc = @"XML node is a zombie - It's parent structure has been freed!"; \
[[NSAssertionHandler currentHandler] handleFailureInMethod:_cmd \
object:self \
file:@__FILE__ \
lineNumber:__LINE__ \
description:desc]; \
} \
}while(NO)
#endif

Expand Down Expand Up @@ -178,8 +178,8 @@ NS_INLINE BOOL IsXmlNsPtr(void *kindPtr)

- (BOOL)_hasParent;

+ (void)getHasPrefix:(BOOL *)hasPrefixPtr localName:(NSString **)localNamePtr forName:(NSString *)name;
+ (void)getPrefix:(NSString **)prefixPtr localName:(NSString **)localNamePtr forName:(NSString *)name;
+ (void)getHasPrefix:(BOOL *)hasPrefixPtr localName:(NSString * __autoreleasing*)localNamePtr forName:(NSString *)name;
+ (void)getPrefix:(NSString * __autoreleasing*)prefixPtr localName:(NSString * __autoreleasing*)localNamePtr forName:(NSString *)name;

+ (void)recursiveStripDocPointersFromNode:(xmlNodePtr)node;

Expand Down