Use different variable names. This was giving "shadowed declarations"

warnings during compile.



SVN revision: 45527
This commit is contained in:
Christopher Michael 2010-01-24 19:51:22 +00:00
parent c6f9892e63
commit 029111a9b8
2 changed files with 16 additions and 16 deletions

View File

@ -82,33 +82,33 @@ eina_inlist_iterator_free(Eina_Iterator_Inlist *it) {
}
static Eina_Bool
eina_inlist_accessor_get_at(Eina_Accessor_Inlist *it, unsigned int index, void **data) {
eina_inlist_accessor_get_at(Eina_Accessor_Inlist *it, unsigned int idx, void **data) {
const Eina_Inlist *over;
unsigned int middle;
unsigned int i;
if (it->index == index) {
if (it->index == idx) {
over = it->current;
} else if (index > it->index) {
} else if (idx > it->index) {
/* Looking after current. */
for (i = it->index, over = it->current;
i < index && over != NULL;
i < idx && over != NULL;
++i, over = over->next)
;
} else {
middle = it->index >> 1;
if (index > middle) {
if (idx > middle) {
/* Looking backward from current. */
for (i = it->index, over = it->current;
i > index && over != NULL;
i > idx && over != NULL;
--i, over = over->prev)
;
} else {
/* Looking from the start. */
for (i = 0, over = it->head;
i < index && over != NULL;
i < idx && over != NULL;
++i, over = over->next)
;
}
@ -117,7 +117,7 @@ eina_inlist_accessor_get_at(Eina_Accessor_Inlist *it, unsigned int index, void *
if (over == NULL) return EINA_FALSE;
it->current = over;
it->index = index;
it->index = idx;
if (data) *data = (void*) over;
return EINA_TRUE;

View File

@ -1367,18 +1367,18 @@ EAPI Eina_List *
eina_list_reverse_clone(const Eina_List *list)
{
const Eina_List *l;
Eina_List *clone;
Eina_List *lclone;
void *data;
if (!list) return NULL;
EINA_MAGIC_CHECK_LIST(list, NULL);
clone = NULL;
lclone = NULL;
EINA_LIST_FOREACH(list, l, data)
clone = eina_list_prepend(clone, data);
lclone = eina_list_prepend(lclone, data);
return clone;
return lclone;
}
/**
@ -1400,18 +1400,18 @@ EAPI Eina_List *
eina_list_clone(const Eina_List *list)
{
const Eina_List *l;
Eina_List *clone;
Eina_List *lclone;
void *data;
if (!list) return NULL;
EINA_MAGIC_CHECK_LIST(list, NULL);
clone = NULL;
lclone = NULL;
EINA_LIST_FOREACH(list, l, data)
clone = eina_list_append(clone, data);
lclone = eina_list_append(lclone, data);
return clone;
return lclone;
}
/**