diff options
| author | Mike Hommey <glandium@debian.org> | 2008-04-09 10:33:41 +0200 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2008-04-09 10:33:41 +0200 |
| commit | 88f9c7ca80bfbc9a5429fc632b90d6c4a2a2787d (patch) | |
| tree | e12ef38cd8eb205c495e5718852d758b95e3a3c6 /xmlschemas.c | |
| parent | fc760252aba4054a612dd20b803d0c7c19713064 (diff) | |
| download | libxml2-88f9c7ca80bfbc9a5429fc632b90d6c4a2a2787d.tar.gz | |
Load /tmp/libxml2-2.6.32 intoupstream/2.6.32.dfsg
libxml2/branches/upstream/current.
Diffstat (limited to 'xmlschemas.c')
| -rw-r--r-- | xmlschemas.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmlschemas.c b/xmlschemas.c index f6b86dd..d57ba9f 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -21808,9 +21808,9 @@ xmlSchemaValidateNotation(xmlSchemaValidCtxtPtr vctxt, return (1); } if (xmlSchemaGetNotation(schema, localName, nsName) != NULL) { - if (valNeeded && (val != NULL)) { - (*val) = xmlSchemaNewNOTATIONValue(BAD_CAST localName, - BAD_CAST xmlStrdup(nsName)); + if ((valNeeded) && (val != NULL)) { + (*val) = xmlSchemaNewNOTATIONValue(xmlStrdup(localName), + xmlStrdup(nsName)); if (*val == NULL) ret = -1; } @@ -28108,8 +28108,8 @@ externalSubsetSplit(void *ctx, const xmlChar *name, { xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx; if ((ctxt != NULL) && (ctxt->user_sax != NULL) && - (ctxt->user_sax->internalSubset != NULL)) - ctxt->user_sax->internalSubset(ctxt->user_data, name, ExternalID, + (ctxt->user_sax->externalSubset != NULL)) + ctxt->user_sax->externalSubset(ctxt->user_data, name, ExternalID, SystemID); } @@ -28315,8 +28315,8 @@ cdataBlockSplit(void *ctx, const xmlChar *value, int len) if (ctxt == NULL) return; if ((ctxt->user_sax != NULL) && - (ctxt->user_sax->ignorableWhitespace != NULL)) - ctxt->user_sax->ignorableWhitespace(ctxt->user_data, value, len); + (ctxt->user_sax->cdataBlock != NULL)) + ctxt->user_sax->cdataBlock(ctxt->user_data, value, len); if (ctxt->ctxt != NULL) xmlSchemaSAXHandleCDataSection(ctxt->ctxt, value, len); } |