small change to xmlSchemaValidateAttributes, also corrected typo on error
* xmlschemas.c: small change to xmlSchemaValidateAttributes,
also corrected typo on error code enum.
* include/libxml/xmlerror.h: corrected typo on schema error
code enum
diff --git a/ChangeLog b/ChangeLog
index 9fc1983..33109d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 3 18:38:27 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+ * xmlschemas.c: small change to xmlSchemaValidateAttributes,
+ also corrected typo on error code enum.
+ * include/libxml/xmlerror.h: corrected typo on schema error
+ code enum
+
Thu Jun 3 10:12:38 HKT 2004 William Brack <wbrack@mmm.com.hk>
* xmlschemas.c: minor cosmetic changes, no change to logic.
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index 9e609ea..3d48403 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -568,8 +568,8 @@
XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER, /* 1791 */
XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE, /* 1792 */
XML_SCHEMAP_UNION_NOT_EXPRESSIBLE, /* 1793 */
- XML_SCHRMAP_SRC_IMPORT_3_1, /* 1794 */
- XML_SCHRMAP_SRC_IMPORT_3_2, /* 1795 */
+ XML_SCHEMAP_SRC_IMPORT_3_1, /* 1794 */
+ XML_SCHEMAP_SRC_IMPORT_3_2, /* 1795 */
XML_SCHEMAV_NOROOT = 1800,
XML_SCHEMAV_UNDECLAREDELEM, /* 1801 */
XML_SCHEMAV_NOTTOPLEVEL, /* 1802 */
diff --git a/xmlschemas.c b/xmlschemas.c
index 68d6467..17f612f 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -3485,7 +3485,7 @@
if (!xmlStrEqual(import->schema->targetNamespace, namespace)) {
if (namespace == NULL) {
if (import->schema->targetNamespace != NULL) {
- xmlSchemaPErr(ctxt, node, XML_SCHRMAP_SRC_IMPORT_3_2,
+ xmlSchemaPErr(ctxt, node, XML_SCHEMAP_SRC_IMPORT_3_2,
"There is no namespace attribute on the <import> "
"element information item, so the imported document "
"must have no targetNamespace attribute.\n",
@@ -3493,14 +3493,14 @@
}
} else {
if (import->schema->targetNamespace != NULL) {
- xmlSchemaPErr(ctxt, node, XML_SCHRMAP_SRC_IMPORT_3_1,
+ xmlSchemaPErr(ctxt, node, XML_SCHEMAP_SRC_IMPORT_3_1,
"The namespace attribute \"%s\" of an <import> "
"element information item must be identical to the "
"targetNamespace attribute \"%s\" of the "
"imported document.\n",
namespace, import->schema->targetNamespace);
} else {
- xmlSchemaPErr(ctxt, node, XML_SCHRMAP_SRC_IMPORT_3_1,
+ xmlSchemaPErr(ctxt, node, XML_SCHEMAP_SRC_IMPORT_3_1,
"The namespace attribute on the <import> "
"element information item, requires the imported "
"document to have a targetNamespace attribute "
@@ -8430,7 +8430,7 @@
printf("found\n");
#endif
found = 1;
- ctxt->cur = (xmlNodePtr) attrDecl;
+ ctxt->cur = (xmlNodePtr) attr;
if (attrDecl->subtypes == NULL) {
curState->state = XML_SCHEMAS_ATTR_TYPE_NOT_RESOLVED;