mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-07-29 11:41:22 +03:00
- 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
This commit is contained in:
5
tree.c
5
tree.c
@ -6271,10 +6271,10 @@ int
|
||||
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 @@ xmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) {
|
||||
}
|
||||
if (enc != XML_CHAR_ENCODING_UTF8) {
|
||||
handler = xmlFindCharEncodingHandler(encoding);
|
||||
if (handler == NULL) {
|
||||
if (handler == NULL)
|
||||
return(-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user