lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

avoid function parameters names 'list' as this seems to give troubles with

Browse Source 
* 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
This commit is contained in:
Daniel Veillard
2005-10-27 11:56:20 +00:00
parent 6e84bb28dd
commit 7802ba56ff
5 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Wed Oct 26 10:59:21 CEST 2005 Daniel Veillard <daniel@veillard.com>
* parserInternals.c: fix a problem in some error case on Solaris * parserInternals.c: fix a problem in some error case on Solaris

2
include/libxml/valid.h
View File

@ -410,7 +410,7 @@ XMLPUBFUN xmlElementPtr XMLCALL
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlValidGetPotentialChildren(xmlElementContent *ctree, xmlValidGetPotentialChildren(xmlElementContent *ctree,
const xmlChar **list, const xmlChar **names,
int *len, int *len,
int max); int max);

4
include/libxml/xmlregexp.h
View File

@ -183,12 +183,12 @@ XMLPUBFUN int XMLCALL
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlExpGetLanguage(xmlExpCtxtPtr ctxt, xmlExpGetLanguage(xmlExpCtxtPtr ctxt,
xmlExpNodePtr expr, xmlExpNodePtr expr,
const xmlChar**list, const xmlChar**langList,
int len); int len);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlExpGetStart (xmlExpCtxtPtr ctxt, xmlExpGetStart (xmlExpCtxtPtr ctxt,
xmlExpNodePtr expr, xmlExpNodePtr expr,
const xmlChar**list, const xmlChar**tokList,
int len); int len);
XMLPUBFUN xmlExpNodePtr XMLCALL XMLPUBFUN xmlExpNodePtr XMLCALL
xmlExpStringDerive(xmlExpCtxtPtr ctxt, xmlExpStringDerive(xmlExpCtxtPtr ctxt,

23
valid.c
View File

@ -6760,7 +6760,7 @@ xmlValidateDocument(xmlValidCtxtPtr ctxt, xmlDocPtr doc) {
/** /**
* xmlValidGetPotentialChildren: * xmlValidGetPotentialChildren:
* @ctree: an element content tree * @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 * @len: a pointer to the number of element in the list
* @max: the size of the array * @max: the size of the array
* *
@ -6770,32 +6770,33 @@ xmlValidateDocument(xmlValidCtxtPtr ctxt, xmlDocPtr doc) {
*/ */
int int
xmlValidGetPotentialChildren(xmlElementContent *ctree, const xmlChar **list, xmlValidGetPotentialChildren(xmlElementContent *ctree,
const xmlChar **names,
int *len, int max) { int *len, int max) {
int i; int i;
if ((ctree == NULL) || (list == NULL) || (len == NULL)) if ((ctree == NULL) || (names == NULL) || (len == NULL))
return(-1); return(-1);
if (*len >= max) return(*len); if (*len >= max) return(*len);
switch (ctree->type) { switch (ctree->type) {
case XML_ELEMENT_CONTENT_PCDATA: case XML_ELEMENT_CONTENT_PCDATA:
for (i = 0; i < *len;i++) for (i = 0; i < *len;i++)
if (xmlStrEqual(BAD_CAST "#PCDATA", list[i])) return(*len); if (xmlStrEqual(BAD_CAST "#PCDATA", names[i])) return(*len);
list[(*len)++] = BAD_CAST "#PCDATA"; names[(*len)++] = BAD_CAST "#PCDATA";
break; break;
case XML_ELEMENT_CONTENT_ELEMENT: case XML_ELEMENT_CONTENT_ELEMENT:
for (i = 0; i < *len;i++) for (i = 0; i < *len;i++)
if (xmlStrEqual(ctree->name, list[i])) return(*len); if (xmlStrEqual(ctree->name, names[i])) return(*len);
list[(*len)++] = ctree->name; names[(*len)++] = ctree->name;
break; break;
case XML_ELEMENT_CONTENT_SEQ: case XML_ELEMENT_CONTENT_SEQ:
xmlValidGetPotentialChildren(ctree->c1, list, len, max); xmlValidGetPotentialChildren(ctree->c1, names, len, max);
xmlValidGetPotentialChildren(ctree->c2, list, len, max); xmlValidGetPotentialChildren(ctree->c2, names, len, max);
break; break;
case XML_ELEMENT_CONTENT_OR: case XML_ELEMENT_CONTENT_OR:
xmlValidGetPotentialChildren(ctree->c1, list, len, max); xmlValidGetPotentialChildren(ctree->c1, names, len, max);
xmlValidGetPotentialChildren(ctree->c2, list, len, max); xmlValidGetPotentialChildren(ctree->c2, names, len, max);
break; break;
} }

16
xmlregexp.c
View File

@ -6455,7 +6455,7 @@ tail:
* xmlExpGetLanguage: * xmlExpGetLanguage:
* @ctxt: the expression context * @ctxt: the expression context
* @exp: the expression * @exp: the expression
* @list: where to store the tokens * @langList: where to store the tokens
* @len: the allocated lenght of @list * @len: the allocated lenght of @list
* *
* Find all the strings used in @exp and store them in @list * Find all the strings used in @exp and store them in @list
@ -6465,10 +6465,10 @@ tail:
*/ */
int int
xmlExpGetLanguage(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpGetLanguage(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp,
const xmlChar**list, int len) { const xmlChar**langList, int len) {
if ((ctxt == NULL) || (exp == NULL) || (list == NULL) || (len <= 0)) if ((ctxt == NULL) || (exp == NULL) || (langList == NULL) || (len <= 0))
return(-1); return(-1);
return(xmlExpGetLanguageInt(ctxt, exp, list, len, 0)); return(xmlExpGetLanguageInt(ctxt, exp, langList, len, 0));
} }
static int static int
@ -6521,7 +6521,7 @@ tail:
* xmlExpGetStart: * xmlExpGetStart:
* @ctxt: the expression context * @ctxt: the expression context
* @exp: the expression * @exp: the expression
* @list: where to store the tokens * @tokList: where to store the tokens
* @len: the allocated lenght of @list * @len: the allocated lenght of @list
* *
* Find all the strings that appears at the start of the languages * Find all the strings that appears at the start of the languages
@ -6533,10 +6533,10 @@ tail:
*/ */
int int
xmlExpGetStart(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp, xmlExpGetStart(xmlExpCtxtPtr ctxt, xmlExpNodePtr exp,
const xmlChar**list, int len) { const xmlChar**tokList, int len) {
if ((ctxt == NULL) || (exp == NULL) || (list == NULL) || (len <= 0)) if ((ctxt == NULL) || (exp == NULL) || (tokList == NULL) || (len <= 0))
return(-1); return(-1);
return(xmlExpGetStartInt(ctxt, exp, list, len, 0)); return(xmlExpGetStartInt(ctxt, exp, tokList, len, 0));
} }
/** /**