Public/mxml
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/mxml.git synced 2026-09-09 01:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed local variables shadow other local variables or functions.

Browse Source 
A variable 'index' shadowed a function 'index' in string.h.
This commit is contained in:
Ryu Sawada 2007-04-30 08:25:59 +00:00
parent 641d48e06a
commit 7bce4afd0a
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mxml.c
View File

@ -603,7 +603,7 @@ PMXML_NODE mxml_create_root_node()
/** /**
* add a subnode (child) to an existing parent node as a specific position * add a subnode (child) to an existing parent node as a specific position
*/ */
PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, const char *node_name, const char *value, int index) PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, const char *node_name, const char *value, int idx)
{ {
PMXML_NODE pnode, pchild; PMXML_NODE pnode, pchild;
int i, j; int i, j;
@ -619,8 +619,8 @@ PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, const char
assert(parent->child); assert(parent->child);
/* move following nodes one down */ /* move following nodes one down */
if (index < parent->n_children) if (idx < parent->n_children)
for (i=parent->n_children ; i > index ; i--) for (i=parent->n_children ; i > idx ; i--)
memcpy(&parent->child[i], &parent->child[i-1], sizeof(MXML_NODE)); memcpy(&parent->child[i], &parent->child[i-1], sizeof(MXML_NODE));
/* correct parent pointer for children */ /* correct parent pointer for children */
@ -631,7 +631,7 @@ PMXML_NODE mxml_add_special_node_at(PMXML_NODE parent, int node_type, const char
} }
/* initialize new node */ /* initialize new node */
pnode = &parent->child[index]; pnode = &parent->child[idx];
memset(pnode, 0, sizeof(MXML_NODE)); memset(pnode, 0, sizeof(MXML_NODE));
strlcpy(pnode->name, node_name, sizeof(pnode->name)); strlcpy(pnode->name, node_name, sizeof(pnode->name));
pnode->node_type = node_type; pnode->node_type = node_type;
@ -673,9 +673,9 @@ PMXML_NODE mxml_add_node(PMXML_NODE parent, const char *node_name, const char *v
/** /**
* add a subnode (child) to an existing parent node at the end * add a subnode (child) to an existing parent node at the end
*/ */
PMXML_NODE mxml_add_node_at(PMXML_NODE parent, const char *node_name, const char *value, int index) PMXML_NODE mxml_add_node_at(PMXML_NODE parent, const char *node_name, const char *value, int idx)
{ {
return mxml_add_special_node_at(parent, ELEMENT_NODE, node_name, value, index); return mxml_add_special_node_at(parent, ELEMENT_NODE, node_name, value, idx);
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@ -683,7 +683,7 @@ PMXML_NODE mxml_add_node_at(PMXML_NODE parent, const char *node_name, const char
/** /**
* add a whole node tree to an existing parent node at a specific position * add a whole node tree to an existing parent node at a specific position
*/ */
int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int index) int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int idx)
{ {
PMXML_NODE pchild; PMXML_NODE pchild;
int i, j, k; int i, j, k;
@ -707,8 +707,8 @@ int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int index)
} }
assert(parent->child); assert(parent->child);
if (index < parent->n_children) if (idx < parent->n_children)
for (i=parent->n_children ; i > index ; i--) { for (i=parent->n_children ; i > idx ; i--) {
/* move following nodes one down */ /* move following nodes one down */
memcpy(&parent->child[i], &parent->child[i-1], sizeof(MXML_NODE)); memcpy(&parent->child[i], &parent->child[i-1], sizeof(MXML_NODE));
@ -721,9 +721,9 @@ int mxml_add_tree_at(PMXML_NODE parent, PMXML_NODE tree, int index)
} }
/* initialize new node */ /* initialize new node */
memcpy(parent->child+index, tree, sizeof(MXML_NODE)); memcpy(parent->child+idx, tree, sizeof(MXML_NODE));
parent->n_children++; parent->n_children++;
parent->child[index].parent = parent; parent->child[idx].parent = parent;
/* correct parent pointer for children */ /* correct parent pointer for children */
for (i=0 ; i<parent->n_children ; i++) { for (i=0 ; i<parent->n_children ; i++) {
@ -784,11 +784,11 @@ int mxml_get_number_of_children(PMXML_NODE pnode)
/** /**
* return number of subnodes (children) of a node * return number of subnodes (children) of a node
*/ */
PMXML_NODE mxml_subnode(PMXML_NODE pnode, int index) PMXML_NODE mxml_subnode(PMXML_NODE pnode, int idx)
{ {
assert(pnode); assert(pnode);
if (index < pnode->n_children) if (idx < pnode->n_children)
return &pnode->child[index]; return &pnode->child[idx];
return NULL; return NULL;
} }
@ -823,8 +823,8 @@ int mxml_add_resultnode(PMXML_NODE node, const char *xml_path, PMXML_NODE **node
Following elemets are possible Following elemets are possible
/<node>/<node>/..../<node> Find a node in the tree hierarchy /<node>/<node>/..../<node> Find a node in the tree hierarchy
/<node>[index] Find child #[index] of node (index starts from 1) /<node>[idx] Find child #[idx] of node (index starts from 1)
/<node>[index]/<node> Find subnode of the above /<node>[idx]/<node> Find subnode of the above
/<node>[<subnode>=<value>] Find a node which has a specific subnode /<node>[<subnode>=<value>] Find a node which has a specific subnode
/<node>[<subnode>=<value>]/<node> Find subnode of the above /<node>[<subnode>=<value>]/<node> Find subnode of the above
/<node>[@<attrib>=<value>]/<node> Find a node which has a specific attribute /<node>[@<attrib>=<value>]/<node> Find a node which has a specific attribute
@ -836,7 +836,7 @@ int mxml_find_nodes1(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelis
char *p3, node_name[256], condition[256]; char *p3, node_name[256], condition[256];
char cond_name[MXML_MAX_CONDITION][256], cond_value[MXML_MAX_CONDITION][256]; char cond_name[MXML_MAX_CONDITION][256], cond_value[MXML_MAX_CONDITION][256];
int cond_type[MXML_MAX_CONDITION]; int cond_type[MXML_MAX_CONDITION];
int i, j, k, index, num_cond; int i, j, k, idx, num_cond;
int cond_satisfied,cond_index; int cond_satisfied,cond_index;
size_t len; size_t len;
@ -857,14 +857,14 @@ int mxml_find_nodes1(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelis
memcpy(node_name, p1, len); memcpy(node_name, p1, len);
node_name[len] = 0; node_name[len] = 0;
index = 0; idx = 0;
num_cond = 0; num_cond = 0;
while (*p2 == '[') { while (*p2 == '[') {
cond_name[num_cond][0] = cond_value[num_cond][0] = cond_type[num_cond] = 0; cond_name[num_cond][0] = cond_value[num_cond][0] = cond_type[num_cond] = 0;
p2++; p2++;
if (isdigit(*p2)) { if (isdigit(*p2)) {
/* evaluate [index] */ /* evaluate [idx] */
index = atoi(p2); idx = atoi(p2);
p2 = strchr(p2, ']'); p2 = strchr(p2, ']');
if (p2 == NULL) if (p2 == NULL)
return 0; return 0;
@ -938,14 +938,14 @@ int mxml_find_nodes1(PMXML_NODE tree, const char *xml_path, PMXML_NODE **nodelis
} }
if (cond_satisfied==num_cond) { if (cond_satisfied==num_cond) {
cond_index++; cond_index++;
if (index == 0 || cond_index == index) { if (idx == 0 || cond_index == idx) {
if (!mxml_add_resultnode(pnode->child+i, p2, nodelist, found)) if (!mxml_add_resultnode(pnode->child+i, p2, nodelist, found))
return 0; return 0;
} }
} }
} else { } else {
if (strcmp(pnode->child[i].name, node_name) == 0) if (strcmp(pnode->child[i].name, node_name) == 0)
if (index == 0 || ++j == index) if (idx == 0 || ++j == idx)
if (!mxml_add_resultnode(pnode->child+i, p2, nodelist, found)) if (!mxml_add_resultnode(pnode->child+i, p2, nodelist, found))
return 0; return 0;
} }