- catalog.[ch]: fixes and add xmlLoadCatalogs()
- DOCBparser.c: small cleanup
- xmllint.c: added a --catalogs option to load catalogs from
$SGML_CATALOG_FILES
- tree.c: cleanup
- configure.in: iconv library fixup, ICONV_LIBS
Daniel
diff --git a/tree.c b/tree.c
index f30419b..f90c3d4 100644
--- a/tree.c
+++ b/tree.c
@@ -6271,10 +6271,10 @@
xmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) {
xmlOutputBufferPtr buf;
xmlCharEncodingHandlerPtr handler = NULL;
+ xmlCharEncoding enc;
int ret;
if (encoding != NULL) {
- xmlCharEncoding enc;
enc = xmlParseCharEncoding(encoding);
if (cur->charset != XML_CHAR_ENCODING_UTF8) {
@@ -6284,9 +6284,8 @@
}
if (enc != XML_CHAR_ENCODING_UTF8) {
handler = xmlFindCharEncodingHandler(encoding);
- if (handler == NULL) {
+ if (handler == NULL)
return(-1);
- }
}
}