diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libxml.spec.in | 1 | ||||
| -rw-r--r-- | xmllint.c | 1 | ||||
| -rw-r--r-- | xmlschemastypes.c | 9 |
4 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Wed Mar 16 13:55:31 CET 2005 Daniel Veillard <daniel@veillard.com> + + * libxml.spec.in: do not package .la files + * xmllint.c: applied patch from Gerry Murphy for xmllint return code + * xmlschemastypes.c: fixed a couple of missing tests of parameters + at public API entry points. + Tue Mar 15 23:31:14 HKT 2005 William Brack <wbrack@mmm.com.hk> * xmlschemastypes.c: a couple of more changes to various diff --git a/libxml.spec.in b/libxml.spec.in index 481f88ec..eed0f5f0 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -96,6 +96,7 @@ gzip -9 ChangeLog rm -fr %{buildroot} %makeinstall +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -fr %{buildroot} @@ -695,6 +695,7 @@ xmlHTMLValidityError(void *ctx, const char *msg, ...) xmlHTMLPrintFileContext(input); xmlHTMLEncodeSend(); + progresult = XMLLINT_ERR_VALID; } /** diff --git a/xmlschemastypes.c b/xmlschemastypes.c index 52727b54..e6d2b9a5 100644 --- a/xmlschemastypes.c +++ b/xmlschemastypes.c @@ -4409,6 +4409,8 @@ xmlSchemaCompareValuesWhtsp(xmlSchemaValPtr x, xmlSchemaValPtr y, xmlSchemaWhitespaceValueType yws) { + if ((x == NULL) || (y == NULL)) + return(-2); return(xmlSchemaCompareValuesInternal(x->type, x, NULL, xws, y->type, y, NULL, yws)); } @@ -4833,7 +4835,7 @@ xmlSchemaValidateFacetInternal(xmlSchemaFacetPtr facet, * number otherwise and -1 in case of internal or API error. */ int -xmlSchemaValidateFacet(xmlSchemaTypePtr base ATTRIBUTE_UNUSED, +xmlSchemaValidateFacet(xmlSchemaTypePtr base, xmlSchemaFacetPtr facet, const xmlChar *value, xmlSchemaValPtr val) @@ -4843,15 +4845,16 @@ xmlSchemaValidateFacet(xmlSchemaTypePtr base ATTRIBUTE_UNUSED, * xmlSchemaValidateFacet() and the new xmlSchemaValidateFacetInternal() and * xmlSchemaValidateFacetWhtsp(). */ - if (val != NULL) + if (val != NULL) { return(xmlSchemaValidateFacetInternal(facet, XML_SCHEMA_WHITESPACE_UNKNOWN, val->type, val, value, XML_SCHEMA_WHITESPACE_UNKNOWN)); - else { + } else if (base != NULL) { return(xmlSchemaValidateFacetInternal(facet, XML_SCHEMA_WHITESPACE_UNKNOWN, base->builtInType, val, value, XML_SCHEMA_WHITESPACE_UNKNOWN)); } + return(-1); } /** |