let's see how much of a pain murrayc is really gonna be. Daniel
* DOCBparser.c include/libxml/DOCBparser.h: let's see how much
of a pain murrayc is really gonna be.
Daniel
diff --git a/ChangeLog b/ChangeLog
index 7ba63d6..4cb070f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 1 14:20:10 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+ * DOCBparser.c include/libxml/DOCBparser.h: let's see how much
+ of a pain murrayc is really gonna be.
+
Wed Oct 1 11:03:40 CEST 2003 Daniel Veillard <daniel@veillard.com>
* xmlreader.c: Applied fix for bug #123481 reported by Peter Derr
diff --git a/DOCBparser.c b/DOCBparser.c
index 0a73ce4..ccb577f 100644
--- a/DOCBparser.c
+++ b/DOCBparser.c
@@ -3,7 +3,7 @@
*
* This is deprecated !!!
* Code removed with release 2.6.0 it was broken.
- * Empty interface kept purely for symbols binary compatibility
+ * The doc are expect to be migrated to XML DocBook
*
* See Copyright for the status of this software.
*
@@ -71,7 +71,7 @@
"docbParseDocument() deprecated function reached\n");
deprecated = 1;
}
- return (-1);
+ return (xmlParseDocument(ctxt));
}
/**
@@ -92,6 +92,7 @@
"docbFreeParserCtxt() deprecated function reached\n");
deprecated = 1;
}
+ xmlFreeParserCtxt(ctxt);
}
/**
@@ -119,7 +120,7 @@
deprecated = 1;
}
- return (-1);
+ return (xmlParseChunk(ctxt, chunk, size, terminate));
}
/**
@@ -154,7 +155,7 @@
deprecated = 1;
}
- return (NULL);
+ return(xmlCreatePushParserCtxt(sax, user_data, chunk, size, filename));
}
/**
@@ -185,7 +186,8 @@
deprecated = 1;
}
- return (NULL);
+ return (xmlSAXParseMemoryWithData(sax, (const char *)cur,
+ xmlStrlen((const xmlChar *) cur), 0, userData));
}
/**
@@ -210,7 +212,7 @@
deprecated = 1;
}
- return (NULL);
+ return (xmlParseDoc(cur));
}
@@ -237,7 +239,7 @@
deprecated = 1;
}
- return (NULL);
+ return (xmlCreateFileParserCtxt(filename));
}
/**
@@ -269,7 +271,7 @@
deprecated = 1;
}
- return (NULL);
+ return (xmlSAXParseFileWithData(sax, filename, 0, userData));
}
/**
@@ -296,6 +298,6 @@
deprecated = 1;
}
- return (NULL);
+ return (xmlParseFile(filename));
}
#endif /* LIBXML_DOCB_ENABLED */
diff --git a/include/libxml/DOCBparser.h b/include/libxml/DOCBparser.h
index 6fc25ee..3be1f98 100644
--- a/include/libxml/DOCBparser.h
+++ b/include/libxml/DOCBparser.h
@@ -10,10 +10,11 @@
#define __DOCB_PARSER_H__
#include <libxml/xmlversion.h>
#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
#ifndef IN_LIBXML
#warning "The DOCBparser module has been deprecated in libxml2-2.6.0"
-#else
+#endif
#ifdef __cplusplus
extern "C" {
#endif
@@ -81,6 +82,4 @@
#ifdef __cplusplus
}
#endif
-#endif /* IN_LIBXML */
-
#endif /* __DOCB_PARSER_H__ */