avoid function parameters names 'list' as this seems to give troubles with
* valid.c xmlregexp.c include/libxml/valid.h
include/libxml/xmlregexp.h: avoid function parameters names 'list'
as this seems to give troubles with VC6 and stl as reported by
Samuel Diaz Garcia.
Daniel
diff --git a/ChangeLog b/ChangeLog
index 3d09dd1..2bbf804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 27 13:54:52 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+ * valid.c xmlregexp.c include/libxml/valid.h
+ include/libxml/xmlregexp.h: avoid function parameters names 'list'
+ as this seems to give troubles with VC6 and stl as reported by
+ Samuel Diaz Garcia.
+
Wed Oct 26 10:59:21 CEST 2005 Daniel Veillard <daniel@veillard.com>
* parserInternals.c: fix a problem in some error case on Solaris
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index d13e4eb..7492d28 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -410,7 +410,7 @@
XMLPUBFUN int XMLCALL
xmlValidGetPotentialChildren(xmlElementContent *ctree,
- const xmlChar **list,
+ const xmlChar **names,
int *len,
int max);
diff --git a/include/libxml/xmlregexp.h b/include/libxml/xmlregexp.h
index a257bb4..022cd6a 100644
--- a/include/libxml/xmlregexp.h
+++ b/include/libxml/xmlregexp.h
@@ -183,12 +183,12 @@
XMLPUBFUN int XMLCALL
xmlExpGetLanguage(xmlExpCtxtPtr ctxt,
xmlExpNodePtr expr,
- const xmlChar**list,
+ const xmlChar**langList,
int len);
XMLPUBFUN int XMLCALL
xmlExpGetStart (xmlExpCtxtPtr ctxt,
xmlExpNodePtr expr,
- const xmlChar**list,
+ const xmlChar**tokList,
int len);
XMLPUBFUN xmlExpNodePtr XMLCALL
xmlExpStringDerive(xmlExpCtxtPtr ctxt,
diff --git a/valid.c b/valid.c
index 3ee5630..4fcf447 100644
--- a/valid.c
+++ b/valid.c
@@ -6760,7 +6760,7 @@
/**
* xmlValidGetPotentialChildren:
* @ctree: an element content tree
- * @list: an array to store the list of child names
+ * @names: an array to store the list of child names
* @len: a pointer to the number of element in the list
* @max: the size of the array
*
@@ -6770,32 +6770,33 @@
*/
int
-xmlValidGetPotentialChildren(xmlElementContent *ctree, const xmlChar **list,
+xmlValidGetPotentialChildren(xmlElementContent *ctree,
+ const xmlChar **names,
int *len, int max) {
int i;
- if ((ctree == NULL) || (list == NULL) || (len == NULL))
+ if ((ctree == NULL) || (names == NULL) || (len == NULL))
return(-1);
if (*len >= max) return(*len);
switch (ctree->type) {
case XML_ELEMENT_CONTENT_PCDATA:
for (i = 0; i < *len;i++)
- if (xmlStrEqual(BAD_CAST "#PCDATA", list[i])) return(*len);
- list[(*len)++] = BAD_CAST "#PCDATA";
+ if (xmlStrEqual(BAD_CAST "#PCDATA", names[i])) return(*len);
+ names[(*len)++] = BAD_CAST "#PCDATA";
break;
case XML_ELEMENT_CONTENT_ELEMENT:
for (i = 0; i < *len;i++)
- if (xmlStrEqual(ctree->name, list[i])) return(*len);
- list[(*len)++] = ctree->name;
+ if (xmlStrEqual(ctree->name, names[i])) return(*len);
+ names[(*len)++] = ctree->name;
break;
case XML_ELEMENT_CONTENT_SEQ:
- xmlValidGetPotentialChildren(ctree->c1, list, len, max);
- xmlValidGetPotentialChildren(ctree->c2, list, len, max);
+ xmlValidGetPotentialChildren(ctree->c1, names, len, max);
+ xmlValidGetPotentialChildren(ctree->c2, names, len, max);
break;
case XML_ELEMENT_CONTENT_OR:
- xmlValidGetPotentialChildren(ctree->c1, list, len, max);
- xmlValidGetPotentialChildren(ctree->c2, list, len, max);
+ xmlValidGetPotentialChildren(ctree->c1, names, len, max);
+ xmlValidGetPotentialChildren(ctree->c2, names, len, max);
break;
}
diff --git a/xmlregexp.c b/xmlregexp.c
index dea0977..fe02822 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -6455,7 +6455,7 @@
* xmlExpGetLanguage:
* @ctxt: the expression context
* @exp: the expression
- * @list: where to store the tokens
+ * @langList: where to store the tokens
* @len: the allocated lenght of @list
*
* Find all the strings used in @exp and store them in @list
@@ -6465,10 +6465,10 @@
*/
int
xmlExpGetLanguage(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp,
- const xmlChar**list, int len) {
- if ((ctxt == NULL) || (exp == NULL) || (list == NULL) || (len <= 0))
+ const xmlChar**langList, int len) {
+ if ((ctxt == NULL) || (exp == NULL) || (langList == NULL) || (len <= 0))
return(-1);
- return(xmlExpGetLanguageInt(ctxt, exp, list, len, 0));
+ return(xmlExpGetLanguageInt(ctxt, exp, langList, len, 0));
}
static int
@@ -6521,7 +6521,7 @@
* xmlExpGetStart:
* @ctxt: the expression context
* @exp: the expression
- * @list: where to store the tokens
+ * @tokList: where to store the tokens
* @len: the allocated lenght of @list
*
* Find all the strings that appears at the start of the languages
@@ -6533,10 +6533,10 @@
*/
int
xmlExpGetStart(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp,
- const xmlChar**list, int len) {
- if ((ctxt == NULL) || (exp == NULL) || (list == NULL) || (len <= 0))
+ const xmlChar**tokList, int len) {
+ if ((ctxt == NULL) || (exp == NULL) || (tokList == NULL) || (len <= 0))
return(-1);
- return(xmlExpGetStartInt(ctxt, exp, list, len, 0));
+ return(xmlExpGetStartInt(ctxt, exp, tokList, len, 0));
}
/**