Adding new version of the SAX interface, it's not there yet, currently
* Makefile.am SAX2.c include/libxml/Makefile.am include/libxml/SAX2.h:
Adding new version of the SAX interface, it's not there yet,
currently just preparing the work
* globals.c parser.c SAX.c include/libxml/SAX.h
include/libxml/globals.h include/libxml/parser.h: doing some
refactoring of the SAXv1 interfaces, obsoleting a bunch of them
while keeping functionalities, preparing SAX2 integration.
* dict.c: small cleanup.
Daniel
diff --git a/parser.c b/parser.c
index 4eb5265..814ceea 100644
--- a/parser.c
+++ b/parser.c
@@ -3682,8 +3682,8 @@
ctxt->myDoc->intSubset = xmlNewDtd(ctxt->myDoc,
BAD_CAST "fake", NULL, NULL);
- entityDecl(ctxt, name, XML_INTERNAL_GENERAL_ENTITY,
- NULL, NULL, value);
+ xmlSAX2EntityDecl(ctxt, name, XML_INTERNAL_GENERAL_ENTITY,
+ NULL, NULL, value);
}
} else {
URI = xmlParseExternalID(ctxt, &literal, 1);
@@ -3775,9 +3775,9 @@
if (ctxt->myDoc->intSubset == NULL)
ctxt->myDoc->intSubset = xmlNewDtd(ctxt->myDoc,
BAD_CAST "fake", NULL, NULL);
- entityDecl(ctxt, name,
- XML_EXTERNAL_GENERAL_PARSED_ENTITY,
- literal, URI, NULL);
+ xmlSAX2EntityDecl(ctxt, name,
+ XML_EXTERNAL_GENERAL_PARSED_ENTITY,
+ literal, URI, NULL);
}
}
}
@@ -3816,7 +3816,7 @@
(ctxt->sax->getEntity != NULL))
cur = ctxt->sax->getEntity(ctxt->userData, name);
if ((cur == NULL) && (ctxt->userData==ctxt)) {
- cur = getEntity(ctxt, name);
+ cur = xmlSAX2GetEntity(ctxt, name);
}
}
if (cur != NULL) {
@@ -5746,7 +5746,7 @@
ent = xmlGetPredefinedEntity(name);
if ((ctxt->wellFormed == 1 ) && (ent == NULL) &&
(ctxt->userData==ctxt)) {
- ent = getEntity(ctxt, name);
+ ent = xmlSAX2GetEntity(ctxt, name);
}
}
/*
@@ -5942,7 +5942,7 @@
if (ent == NULL)
ent = xmlGetPredefinedEntity(name);
if ((ent == NULL) && (ctxt->userData==ctxt)) {
- ent = getEntity(ctxt, name);
+ ent = xmlSAX2GetEntity(ctxt, name);
}
}
/*