Skip to content

Commit

Permalink
do not package .la files applied patch from Gerry Murphy for xmllint
Browse files Browse the repository at this point in the history
* 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.
Daniel
  • Loading branch information
Daniel Veillard committed Mar 16, 2005
1 parent b08d741 commit 9fcb491
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions libxml.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ gzip -9 ChangeLog
rm -fr %{buildroot}

%makeinstall
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -fr %{buildroot}
Expand Down
1 change: 1 addition & 0 deletions xmllint.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ xmlHTMLValidityError(void *ctx, const char *msg, ...)

xmlHTMLPrintFileContext(input);
xmlHTMLEncodeSend();
progresult = XMLLINT_ERR_VALID;
}

/**
Expand Down
9 changes: 6 additions & 3 deletions xmlschemastypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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)
Expand All @@ -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);
}

/**
Expand Down

0 comments on commit 9fcb491

Please sign in to comment.