summaryrefslogtreecommitdiffstats
path: root/libcnary
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2014-05-20 17:46:06 +0200
committerGravatar Martin Szulecki2014-05-20 17:46:06 +0200
commit993f65b3bda53e2b22ee9e94efd11cbddd7b73cb (patch)
tree0c9b436ae656e36a84a937adf5f6cbfae07f28f1 /libcnary
parent7b59a04d9406fde0847d1ce68c3bf2fde018c198 (diff)
downloadlibplist-993f65b3bda53e2b22ee9e94efd11cbddd7b73cb.tar.gz
libplist-993f65b3bda53e2b22ee9e94efd11cbddd7b73cb.tar.bz2
Rename "index" variable as it shadows global declaration on older systems
Diffstat (limited to 'libcnary')
-rw-r--r--libcnary/node.c20
-rw-r--r--libcnary/node_list.c14
2 files changed, 17 insertions, 17 deletions
diff --git a/libcnary/node.c b/libcnary/node.c
index 46532aa..fadc9de 100644
--- a/libcnary/node.c
+++ b/libcnary/node.c
@@ -96,14 +96,14 @@ int node_attach(node_t* parent, node_t* child) {
int node_detach(node_t* parent, node_t* child) {
if (!parent || !child) return -1;
- int index = node_list_remove(parent->children, child);
- if (index >= 0) {
+ int node_index = node_list_remove(parent->children, child);
+ if (node_index >= 0) {
parent->count--;
}
- return index;
+ return node_index;
}
-int node_insert(node_t* parent, unsigned int index, node_t* child)
+int node_insert(node_t* parent, unsigned int node_index, node_t* child)
{
if (!parent || !child) return -1;
child->isLeaf = TRUE;
@@ -113,7 +113,7 @@ int node_insert(node_t* parent, unsigned int index, node_t* child)
if(parent->isLeaf == TRUE) {
parent->isLeaf = FALSE;
}
- int res = node_list_insert(parent->children, index, child);
+ int res = node_list_insert(parent->children, node_index, child);
if (res == 0) {
parent->count++;
}
@@ -155,11 +155,11 @@ unsigned int node_n_children(struct node_t* node)
node_t* node_nth_child(struct node_t* node, unsigned int n)
{
if (!node || !node->children || !node->children->begin) return NULL;
- unsigned int index = 0;
+ unsigned int node_index = 0;
int found = 0;
node_t *ch;
for (ch = node_first_child(node); ch; ch = node_next_sibling(ch)) {
- if (index++ == n) {
+ if (node_index++ == n) {
found = 1;
break;
}
@@ -191,7 +191,7 @@ node_t* node_next_sibling(struct node_t* node)
int node_child_position(struct node_t* parent, node_t* child)
{
if (!parent || !parent->children || !parent->children->begin || !child) return -1;
- int index = 0;
+ int node_index = 0;
int found = 0;
node_t *ch;
for (ch = node_first_child(parent); ch; ch = node_next_sibling(ch)) {
@@ -199,12 +199,12 @@ int node_child_position(struct node_t* parent, node_t* child)
found = 1;
break;
}
- index++;
+ node_index++;
}
if (!found) {
return -1;
}
- return index;
+ return node_index;
}
node_t* node_copy_deep(node_t* node, copy_func_t copy_func)
diff --git a/libcnary/node_list.c b/libcnary/node_list.c
index 5b291e7..4b268e0 100644
--- a/libcnary/node_list.c
+++ b/libcnary/node_list.c
@@ -72,9 +72,9 @@ int node_list_add(node_list_t* list, node_t* node) {
return 0;
}
-int node_list_insert(node_list_t* list, unsigned int index, node_t* node) {
+int node_list_insert(node_list_t* list, unsigned int node_index, node_t* node) {
if (!list || !node) return -1;
- if (index >= list->count) {
+ if (node_index >= list->count) {
return node_list_add(list, node);
}
@@ -84,8 +84,8 @@ int node_list_insert(node_list_t* list, unsigned int index, node_t* node) {
unsigned int pos = 0;
node_t* prev = NULL;
- if (index > 0) {
- while (pos < index) {
+ if (node_index > 0) {
+ while (pos < node_index) {
prev = cur;
cur = cur->next;
pos++;
@@ -124,7 +124,7 @@ int node_list_remove(node_list_t* list, node_t* node) {
if (!list || !node) return -1;
if (list->count == 0) return -1;
- int index = 0;
+ int node_index = 0;
node_t* n;
for (n = list->begin; n; n = n->next) {
if (node == n) {
@@ -145,9 +145,9 @@ int node_list_remove(node_list_t* list, node_t* node) {
list->begin = newnode;
}
list->count--;
- return index;
+ return node_index;
}
- index++;
+ node_index++;
}
return -1;
}