Fixed library import errors by removing libxml import in header

RSXML/RSAtomParser.m

@@ -22,6 +22,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
+#import <libxml/xmlstring.h>
+
 #import "RSAtomParser.h"
 #import "RSParsedFeed.h"
 #import "RSParsedArticle.h"

RSXML/RSHTMLLinkParser.m

@@ -22,6 +22,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
+#import <libxml/xmlstring.h>
+
 #import "RSHTMLLinkParser.h"
 #import "RSHTMLMetadata.h"
 #import "NSDictionary+RSXML.h"

RSXML/RSHTMLMetadataParser.m

@@ -22,6 +22,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
+#import <libxml/xmlstring.h>
+
 #import "RSHTMLMetadataParser.h"
 #import "RSHTMLMetadata.h"
 #import "NSString+RSXML.h"

RSXML/RSOPMLParser.m

@@ -22,6 +22,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
+#import <libxml/xmlstring.h>
+
 #import "RSOPMLParser.h"
 #import "RSOPMLItem.h"
 

RSXML/RSRSSParser.m

@@ -22,6 +22,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
+#import <libxml/xmlstring.h>
+
 #import "RSRSSParser.h"
 #import "RSParsedFeed.h"
 #import "RSParsedArticle.h"

RSXML/RSSAXParser.h

@@ -23,7 +23,6 @@
 //  SOFTWARE.
 
 @import Foundation;
-#import <libxml/xmlstring.h>
 
 /*Thread-safe, not re-entrant.
 
@@ -37,6 +36,7 @@
 
 @class RSSAXParser;
 
+/// Use @c xmlChar instead of @c unsigned @c char for all method parameters.
 @protocol RSSAXParserDelegate <NSObject>
 
 + (BOOL)isHTMLParser; // reusing class method of RSXMLParser delegate
@@ -44,17 +44,17 @@
 @optional
 
 // Called when parsing HTML
-- (void)saxParser:(RSSAXParser *)SAXParser XMLStartElement:(const xmlChar *)localName attributes:(const xmlChar **)attributes;
+- (void)saxParser:(RSSAXParser *)SAXParser XMLStartElement:(const unsigned char *)localName attributes:(const unsigned char **)attributes;
-- (void)saxParser:(RSSAXParser *)SAXParser XMLEndElement:(const xmlChar *)localName;
+- (void)saxParser:(RSSAXParser *)SAXParser XMLEndElement:(const unsigned char *)localName;
 
 // Called when parsing XML (Atom, RSS, OPML)
-- (void)saxParser:(RSSAXParser *)SAXParser XMLStartElement:(const xmlChar *)localName prefix:(const xmlChar *)prefix uri:(const xmlChar *)uri numberOfNamespaces:(NSInteger)numberOfNamespaces namespaces:(const xmlChar **)namespaces numberOfAttributes:(NSInteger)numberOfAttributes numberDefaulted:(int)numberDefaulted attributes:(const xmlChar **)attributes;
+- (void)saxParser:(RSSAXParser *)SAXParser XMLStartElement:(const unsigned char *)localName prefix:(const unsigned char *)prefix uri:(const unsigned char *)uri numberOfNamespaces:(NSInteger)numberOfNamespaces namespaces:(const unsigned char **)namespaces numberOfAttributes:(NSInteger)numberOfAttributes numberDefaulted:(int)numberDefaulted attributes:(const unsigned char **)attributes;
-- (void)saxParser:(RSSAXParser *)SAXParser XMLEndElement:(const xmlChar *)localName prefix:(const xmlChar *)prefix uri:(const xmlChar *)uri;
+- (void)saxParser:(RSSAXParser *)SAXParser XMLEndElement:(const unsigned char *)localName prefix:(const unsigned char *)prefix uri:(const unsigned char *)uri;
 
 // Called regardless of parser type
-- (void)saxParser:(RSSAXParser *)SAXParser XMLCharactersFound:(const xmlChar *)characters length:(NSUInteger)length;
+- (void)saxParser:(RSSAXParser *)SAXParser XMLCharactersFound:(const unsigned char *)characters length:(NSUInteger)length;
 - (void)saxParserDidReachEndOfDocument:(RSSAXParser *)SAXParser; // If canceled, may not get called (but might).
-- (NSString *)saxParser:(RSSAXParser *)SAXParser internedStringForName:(const xmlChar *)name prefix:(const xmlChar *)prefix; // Okay to return nil. Prefix may be nil.
+- (NSString *)saxParser:(RSSAXParser *)SAXParser internedStringForName:(const unsigned char *)name prefix:(const unsigned char *)prefix; // Okay to return nil. Prefix may be nil.
 - (NSString *)saxParser:(RSSAXParser *)SAXParser internedStringForValue:(const void *)bytes length:(NSUInteger)length;
 @end
 
@@ -72,6 +72,6 @@
 - (void)beginStoringCharacters;
 
 - (NSDictionary *)attributesDictionary:(const unsigned char **)attributes numberOfAttributes:(NSInteger)numberOfAttributes;
-- (NSDictionary *)attributesDictionaryHTML:(const xmlChar **)attributes;
+- (NSDictionary *)attributesDictionaryHTML:(const unsigned char **)attributes;
 
 @end

RSXML/RSXMLError.h

@@ -22,7 +22,6 @@
 //  SOFTWARE.
 
 @import Foundation;
-#import <libxml/xmlerror.h>
 
 extern NSErrorDomain const kLIBXMLParserErrorDomain;
 extern NSErrorDomain const kRSXMLParserErrorDomain;
@@ -44,4 +43,3 @@ typedef NS_ERROR_ENUM(kRSXMLParserErrorDomain, RSXMLError) {
 
 NSError * RSXMLMakeError(RSXMLError code);
 NSError * RSXMLMakeErrorWrongParser(RSXMLError code, RSXMLError expected);
-NSError * RSXMLMakeErrorFromLIBXMLError(xmlErrorPtr err);

RSXML/RSXMLError.m

@@ -65,14 +65,3 @@ NSError * RSXMLMakeErrorWrongParser(RSXMLError code, RSXMLError expected) {
 	return [NSError errorWithDomain:kRSXMLParserErrorDomain code:code
 						   userInfo:@{NSLocalizedDescriptionKey: getErrorMessageForRSXMLError(code, expected)}];
 }
-
-NSError * RSXMLMakeErrorFromLIBXMLError(xmlErrorPtr err) {
-	if (err && err->level == XML_ERR_FATAL) {
-		int errCode = err->code;
-		char * msg = err->message;
-		//if (err->level == XML_ERR_FATAL)
-		NSString *errMsg = [[NSString stringWithFormat:@"%s", msg] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-		return [NSError errorWithDomain:kLIBXMLParserErrorDomain code:errCode userInfo:@{NSLocalizedDescriptionKey: errMsg}];
-	}
-	return nil;
-}

RSXML/RSXMLParser.m

@@ -21,6 +21,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
+#import <libxml/xmlerror.h>
+
 #import "RSXMLParser.h"
 #import "RSXMLData.h"
 #import "RSXMLError.h"
@@ -76,7 +78,14 @@
 		xmlResetLastError();
 		[_parser parseBytes:_xmlData.bytes numberOfBytes:_xmlData.length];
 		if (error) {
-			*error = RSXMLMakeErrorFromLIBXMLError(xmlGetLastError());
+			xmlErrorPtr err = xmlGetLastError();
+			if (err && err->level == XML_ERR_FATAL) {
+				int errCode = err->code;
+				char * msg = err->message;
+				NSString *errMsg = [[NSString stringWithFormat:@"%s", msg] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+				*error = [NSError errorWithDomain:kLIBXMLParserErrorDomain code:errCode userInfo:@{NSLocalizedDescriptionKey: errMsg}];
+			}
+//			*error = RSXMLMakeErrorFromLIBXMLError();
 			xmlResetLastError();
 		}
 	}