summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcnary/node.c20
-rw-r--r--libcnary/node_list.c14
-rw-r--r--src/Array.cpp4
-rw-r--r--src/plist.c4
-rw-r--r--src/ptrarray.c6
5 files changed, 24 insertions, 24 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;
}
diff --git a/src/Array.cpp b/src/Array.cpp
index 419249f..a4ea02a 100644
--- a/src/Array.cpp
+++ b/src/Array.cpp
@@ -90,9 +90,9 @@ Node* Array::Clone()
return new Array(*this);
}
-Node* Array::operator[](unsigned int index)
+Node* Array::operator[](unsigned int array_index)
{
- return _array.at(index);
+ return _array.at(array_index);
}
void Array::Append(Node* node)
diff --git a/src/plist.c b/src/plist.c
index 940362e..137188e 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -70,7 +70,7 @@ static void plist_free_data(plist_data_t data)
static int plist_free_node(node_t* node)
{
plist_data_t data = NULL;
- int index = node_detach(node->parent, node);
+ int node_index = node_detach(node->parent, node);
data = plist_get_data(node);
plist_free_data(data);
node->data = NULL;
@@ -84,7 +84,7 @@ static int plist_free_node(node_t* node)
node_destroy(node);
- return index;
+ return node_index;
}
plist_t plist_new_dict(void)
diff --git a/src/ptrarray.c b/src/ptrarray.c
index 8567752..56d28cb 100644
--- a/src/ptrarray.c
+++ b/src/ptrarray.c
@@ -51,11 +51,11 @@ void ptr_array_add(ptrarray_t *pa, void *data)
pa->len++;
}
-void* ptr_array_index(ptrarray_t *pa, size_t index)
+void* ptr_array_index(ptrarray_t *pa, size_t array_index)
{
if (!pa) return NULL;
- if (index >= pa->len) {
+ if (array_index >= pa->len) {
return NULL;
}
- return pa->pdata[index];
+ return pa->pdata[array_index];
}