lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-08-01 10:06:59 +03:00
Code Activity

remove warnings under Windows.

Browse Source 
* schematron.c xmlregexp.c: remove warnings under Windows.
This commit is contained in:
Rob Richards
2005-10-07 02:33:00 +00:00
parent bedc9771e7
commit 54a8f67c05
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Oct 7 04:34:12 CEST 2005 Rob Richards <rrichards@ctindustries.net>
* schematron.c xmlregexp.c: remove warnings under Windows.
Wed Sep 28 23:42:14 CEST 2005 Daniel Veillard <daniel@veillard.com> Wed Sep 28 23:42:14 CEST 2005 Daniel Veillard <daniel@veillard.com>
* parser.c: applied patch from Massimo Morara fixing bug #317447 * parser.c: applied patch from Massimo Morara fixing bug #317447

6
schematron.c
View File

@ -562,7 +562,7 @@ xmlSchematronFree(xmlSchematronPtr schema)
xmlFreeDoc(schema->doc); xmlFreeDoc(schema->doc);
if (schema->namespaces != NULL) if (schema->namespaces != NULL)
xmlFree(schema->namespaces); xmlFree((char **) schema->namespaces);
xmlSchematronFreeRules(schema->rules); xmlSchematronFreeRules(schema->rules);
xmlSchematronFreePatterns(schema->patterns); xmlSchematronFreePatterns(schema->patterns);
@ -709,7 +709,7 @@ xmlSchematronFreeParserCtxt(xmlSchematronParserCtxtPtr ctxt)
xmlXPathFreeContext(ctxt->xctxt); xmlXPathFreeContext(ctxt->xctxt);
} }
if (ctxt->namespaces != NULL) if (ctxt->namespaces != NULL)
xmlFree(ctxt->namespaces); xmlFree((char **) ctxt->namespaces);
xmlDictFree(ctxt->dict); xmlDictFree(ctxt->dict);
xmlFree(ctxt); xmlFree(ctxt);
} }
@ -809,7 +809,7 @@ xmlSchematronAddNamespace(xmlSchematronParserCtxtPtr ctxt,
const xmlChar **tmp; const xmlChar **tmp;
tmp = (const xmlChar **) tmp = (const xmlChar **)
xmlRealloc(ctxt->namespaces, ctxt->maxNamespaces * 4 * xmlRealloc((xmlChar **) ctxt->namespaces, ctxt->maxNamespaces * 4 *
sizeof(const xmlChar *)); sizeof(const xmlChar *));
if (tmp == NULL) { if (tmp == NULL) {
xmlSchematronPErrMemory(NULL, "allocating parser namespaces", xmlSchematronPErrMemory(NULL, "allocating parser namespaces",

14
xmlregexp.c
View File

@ -6878,10 +6878,10 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
len = xmlExpGetStartInt(ctxt, sub, tab, ctxt->tabSize, 0); len = xmlExpGetStartInt(ctxt, sub, tab, ctxt->tabSize, 0);
while (len < 0) { while (len < 0) {
const xmlChar **temp; const xmlChar **temp;
temp = (const xmlChar **) xmlRealloc(tab, ctxt->tabSize * 2 * temp = (const xmlChar **) xmlRealloc((xmlChar **) tab, ctxt->tabSize * 2 *
sizeof(const xmlChar *)); sizeof(const xmlChar *));
if (temp == NULL) { if (temp == NULL) {
xmlFree(tab); xmlFree((xmlChar **) tab);
return(NULL); return(NULL);
} }
tab = temp; tab = temp;
@ -6892,14 +6892,14 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
tmp = xmlExpStringDeriveInt(ctxt, exp, tab[i]); tmp = xmlExpStringDeriveInt(ctxt, exp, tab[i]);
if ((tmp == NULL) || (tmp == forbiddenExp)) { if ((tmp == NULL) || (tmp == forbiddenExp)) {
xmlExpFree(ctxt, ret); xmlExpFree(ctxt, ret);
xmlFree(tab); xmlFree((xmlChar **) tab);
return(tmp); return(tmp);
} }
tmp2 = xmlExpStringDeriveInt(ctxt, sub, tab[i]); tmp2 = xmlExpStringDeriveInt(ctxt, sub, tab[i]);
if ((tmp2 == NULL) || (tmp2 == forbiddenExp)) { if ((tmp2 == NULL) || (tmp2 == forbiddenExp)) {
xmlExpFree(ctxt, tmp); xmlExpFree(ctxt, tmp);
xmlExpFree(ctxt, ret); xmlExpFree(ctxt, ret);
xmlFree(tab); xmlFree((xmlChar **) tab);
return(tmp); return(tmp);
} }
tmp3 = xmlExpExpDeriveInt(ctxt, tmp, tmp2); tmp3 = xmlExpExpDeriveInt(ctxt, tmp, tmp2);
@ -6908,7 +6908,7 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
if ((tmp3 == NULL) || (tmp3 == forbiddenExp)) { if ((tmp3 == NULL) || (tmp3 == forbiddenExp)) {
xmlExpFree(ctxt, ret); xmlExpFree(ctxt, ret);
xmlFree(tab); xmlFree((xmlChar **) tab);
return(tmp3); return(tmp3);
} }
@ -6917,12 +6917,12 @@ xmlExpExpDeriveInt(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpNodePtr sub) {
else { else {
ret = xmlExpHashGetEntry(ctxt, XML_EXP_OR, ret, tmp3, NULL, 0, 0); ret = xmlExpHashGetEntry(ctxt, XML_EXP_OR, ret, tmp3, NULL, 0, 0);
if (ret == NULL) { if (ret == NULL) {
xmlFree(tab); xmlFree((xmlChar **) tab);
return(NULL); return(NULL);
} }
} }
} }
xmlFree(tab); xmlFree((xmlChar **) tab);
return(ret); return(ret);
} }