trying to fix some troubles w.r.t. function returning const xxxPtr. Daniel
* HTMLparser.c HTMLtree.c include/libxml/HTMLparser.h:
trying to fix some troubles w.r.t. function returning
const xxxPtr.
Daniel
diff --git a/ChangeLog b/ChangeLog
index c526c1f..1ee73ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 17 01:25:21 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+ * HTMLparser.c HTMLtree.c include/libxml/HTMLparser.h:
+ trying to fix some troubles w.r.t. function returning
+ const xxxPtr.
+
Thu Aug 16 21:33:20 CEST 2001 Daniel Veillard <daniel@veillard.com>
* win32/dsp/libxml2.def.src: another set of symbols conditionally
diff --git a/HTMLparser.c b/HTMLparser.c
index 4f37f6a..6824ddd 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -616,7 +616,7 @@
*
* Returns the related htmlElemDescPtr or NULL if not found.
*/
-const htmlElemDescPtr
+const htmlElemDesc *
htmlTagLookup(const xmlChar *tag) {
unsigned int i;
@@ -690,7 +690,7 @@
*/
static void
htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
- htmlElemDescPtr info;
+ const htmlElemDesc * info;
xmlChar *oldname;
int i, priority;
@@ -1337,7 +1337,7 @@
*
* Returns the associated htmlEntityDescPtr if found, NULL otherwise.
*/
-const htmlEntityDescPtr
+const htmlEntityDesc *
htmlEntityLookup(const xmlChar *name) {
unsigned int i;
@@ -1363,7 +1363,7 @@
*
* Returns the associated htmlEntityDescPtr if found, NULL otherwise.
*/
-const htmlEntityDescPtr
+const htmlEntityDesc *
htmlEntityValueLookup(unsigned int value) {
unsigned int i;
#ifdef DEBUG
@@ -1464,7 +1464,7 @@
*out++ = c;
} else {
int len;
- htmlEntityDescPtr ent;
+ const htmlEntityDesc * ent;
/*
* Try to lookup a predefined HTML entity for it
@@ -1557,7 +1557,7 @@
break;
*out++ = c;
} else {
- htmlEntityDescPtr ent;
+ const htmlEntityDesc * ent;
const char *cp;
char nbuf[16];
int len;
@@ -1952,7 +1952,7 @@
xmlChar *name = NULL;
xmlChar *cur = NULL;
- htmlEntityDescPtr ent;
+ const htmlEntityDesc * ent;
/*
* allocate a translation buffer.
@@ -2079,10 +2079,10 @@
* Returns the associated htmlEntityDescPtr if found, or NULL otherwise,
* if non-NULL *str will have to be freed by the caller.
*/
-htmlEntityDescPtr
+const htmlEntityDesc *
htmlParseEntityRef(htmlParserCtxtPtr ctxt, xmlChar **str) {
xmlChar *name;
- htmlEntityDescPtr ent = NULL;
+ const htmlEntityDesc * ent = NULL;
*str = NULL;
if (CUR == '&') {
@@ -3188,7 +3188,7 @@
*/
static void
htmlParseReference(htmlParserCtxtPtr ctxt) {
- htmlEntityDescPtr ent;
+ const htmlEntityDesc * ent;
xmlChar out[6];
xmlChar *name;
if (CUR != '&') return;
@@ -3390,7 +3390,7 @@
htmlParseElement(htmlParserCtxtPtr ctxt) {
xmlChar *name;
xmlChar *currentNode = NULL;
- htmlElemDescPtr info;
+ const htmlElemDesc * info;
htmlParserNodeInfo node_info;
xmlChar *oldname;
int depth = ctxt->nameNr;
@@ -4153,7 +4153,7 @@
case XML_PARSER_START_TAG: {
xmlChar *name, *oldname;
int depth = ctxt->nameNr;
- htmlElemDescPtr info;
+ const htmlElemDesc * info;
if (avail < 2)
goto done;
diff --git a/HTMLtree.c b/HTMLtree.c
index 6ad48e3..cc61ef9 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -433,7 +433,7 @@
void
htmlNodeDumpFormat(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur,
int format) {
- htmlElemDescPtr info;
+ const htmlElemDesc * info;
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
@@ -931,7 +931,7 @@
void
htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
xmlNodePtr cur, const char *encoding, int format) {
- htmlElemDescPtr info;
+ const htmlElemDesc * info;
if (cur == NULL) {
xmlGenericError(xmlGenericErrorContext,
diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h
index 10205a7..86b6f8b 100644
--- a/include/libxml/HTMLparser.h
+++ b/include/libxml/HTMLparser.h
@@ -58,16 +58,16 @@
/*
* There is only few public functions.
*/
-const htmlElemDescPtr htmlTagLookup (const xmlChar *tag);
-const htmlEntityDescPtr htmlEntityLookup(const xmlChar *name);
-const htmlEntityDescPtr htmlEntityValueLookup(unsigned int value);
+const htmlElemDesc * htmlTagLookup (const xmlChar *tag);
+const htmlEntityDesc * htmlEntityLookup(const xmlChar *name);
+const htmlEntityDesc * htmlEntityValueLookup(unsigned int value);
int htmlIsAutoClosed(htmlDocPtr doc,
htmlNodePtr elem);
int htmlAutoCloseTag(htmlDocPtr doc,
const xmlChar *name,
htmlNodePtr elem);
-htmlEntityDescPtr htmlParseEntityRef(htmlParserCtxtPtr ctxt,
+const htmlEntityDesc * htmlParseEntityRef(htmlParserCtxtPtr ctxt,
xmlChar **str);
int htmlParseCharRef(htmlParserCtxtPtr ctxt);
void htmlParseElement(htmlParserCtxtPtr ctxt);