kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some more warnings caused by -Wshadow 

SVN revision: 45522
This commit is contained in:
Boris Faure 2010-01-24 13:53:32 +00:00
parent 19d30a8a48
commit c6f9892e63
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/eina/src/tests/ecore_list.c
View File

@ -34,7 +34,7 @@ static void *_ecore_list_next(Ecore_List * list);
static void *_ecore_list_last_goto(Ecore_List * list); static void *_ecore_list_last_goto(Ecore_List * list);
static void *_ecore_list_first_goto(Ecore_List * list); static void *_ecore_list_first_goto(Ecore_List * list);
static void *_ecore_list_goto(Ecore_List * list, const void *data); static void *_ecore_list_goto(Ecore_List * list, const void *data);
static void *_ecore_list_index_goto(Ecore_List *list, int index); static void *_ecore_list_index_goto(Ecore_List *list, int idx);
/* Iterative functions */ /* Iterative functions */
static int _ecore_list_for_each(Ecore_List *list, Ecore_For_Each function, static int _ecore_list_for_each(Ecore_List *list, Ecore_For_Each function,
@ -59,7 +59,7 @@ static Ecore_List_Node *_ecore_dlist_node_merge(Ecore_List_Node *first,
/* Private double linked list functions */ /* Private double linked list functions */
static void *_ecore_dlist_previous(Ecore_DList * list); static void *_ecore_dlist_previous(Ecore_DList * list);
static void *_ecore_dlist_first_remove(Ecore_DList *list); static void *_ecore_dlist_first_remove(Ecore_DList *list);
static void *_ecore_dlist_index_goto(Ecore_DList *list, int index); static void *_ecore_dlist_index_goto(Ecore_DList *list, int idx);
/** /**
@defgroup Ecore_Data_List_Creation_Group List Creation/Destruction Functions @defgroup Ecore_Data_List_Creation_Group List Creation/Destruction Functions
@ -613,18 +613,18 @@ Functions that can be used to traverse an Ecore_List.
/** /**
* Make the current item the item with the given index number. * Make the current item the item with the given index number.
* @param list The list. * @param list The list.
* @param index The position to move the current item. * @param idx The position to move the current item.
* @return A pointer to new current item on success, @c NULL on failure. * @return A pointer to new current item on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Traverse_Group * @ingroup Ecore_Data_List_Traverse_Group
*/ */
EAPI inline void * EAPI inline void *
ecore_list_index_goto(Ecore_List *list, int index) ecore_list_index_goto(Ecore_List *list, int idx)
{ {
void *ret; void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL); CHECK_PARAM_POINTER_RETURN("list", list, NULL);
ret = _ecore_list_index_goto(list, index); ret = _ecore_list_index_goto(list, idx);
return ret; return ret;
} }
@ -632,7 +632,7 @@ ecore_list_index_goto(Ecore_List *list, int index)
/* This is the non-threadsafe version, use this inside internal functions that /* This is the non-threadsafe version, use this inside internal functions that
* already lock the list */ * already lock the list */
static void * static void *
_ecore_list_index_goto(Ecore_List *list, int index) _ecore_list_index_goto(Ecore_List *list, int idx)
{ {
int i; int i;
@ -642,10 +642,10 @@ _ecore_list_index_goto(Ecore_List *list, int index)
if (ecore_list_empty_is(list)) if (ecore_list_empty_is(list))
return NULL; return NULL;
if (index > ecore_list_count(list) || index < 0) if (idx > ecore_list_count(list) || idx < 0)
return NULL; return NULL;
if (index < list->index) if (idx < list->index)
{ {
_ecore_list_first_goto(list); _ecore_list_first_goto(list);
i = 0; i = 0;
@ -653,7 +653,7 @@ _ecore_list_index_goto(Ecore_List *list, int index)
else else
i = list->index; i = list->index;
for (; i < index && _ecore_list_next(list); i++); for (; i < idx && _ecore_list_next(list); i++);
if (i >= list->nodes) if (i >= list->nodes)
return NULL; return NULL;
@ -686,13 +686,13 @@ ecore_list_goto(Ecore_List *list, const void *data)
static void * static void *
_ecore_list_goto(Ecore_List *list, const void *data) _ecore_list_goto(Ecore_List *list, const void *data)
{ {
int index; int idx;
Ecore_List_Node *node; Ecore_List_Node *node;
if (!list) if (!list)
return NULL; return NULL;
index = 0; idx = 0;
node = list->first; node = list->first;
while (node && node->data) while (node && node->data)
@ -706,14 +706,14 @@ _ecore_list_goto(Ecore_List *list, const void *data)
node = next; node = next;
index++; idx++;
} }
if (!node) if (!node)
return NULL; return NULL;
list->current = node; list->current = node;
list->index = index; list->index = idx;
return list->current->data; return list->current->data;
} }
@ -1674,17 +1674,17 @@ ecore_dlist_last_remove(Ecore_DList *list)
/** /**
* Moves the current item to the index number in the given doubly linked list. * Moves the current item to the index number in the given doubly linked list.
* @param list The given doubly linked list. * @param list The given doubly linked list.
* @param index The position to move the current item * @param idx The position to move the current item
* @return The node at specified index on success, @c NULL on error. * @return The node at specified index on success, @c NULL on error.
*/ */
EAPI void * EAPI void *
ecore_dlist_index_goto(Ecore_DList *list, int index) ecore_dlist_index_goto(Ecore_DList *list, int idx)
{ {
void *ret; void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL); CHECK_PARAM_POINTER_RETURN("list", list, NULL);
ret = _ecore_dlist_index_goto(list, index); ret = _ecore_dlist_index_goto(list, idx);
return ret; return ret;
} }
@ -1692,7 +1692,7 @@ ecore_dlist_index_goto(Ecore_DList *list, int index)
/* This is the non-threadsafe version, use this inside internal functions that /* This is the non-threadsafe version, use this inside internal functions that
* already lock the list */ * already lock the list */
static void * static void *
_ecore_dlist_index_goto(Ecore_DList *list, int index) _ecore_dlist_index_goto(Ecore_DList *list, int idx)
{ {
int i, increment; int i, increment;
@ -1702,18 +1702,18 @@ _ecore_dlist_index_goto(Ecore_DList *list, int index)
if (ecore_list_empty_is(ECORE_LIST(list))) if (ecore_list_empty_is(ECORE_LIST(list)))
return NULL; return NULL;
if (index > ecore_list_count(ECORE_LIST(list)) || index < 0) if (idx > ecore_list_count(ECORE_LIST(list)) || idx < 0)
return NULL; return NULL;
if (ECORE_LIST(list)->index >= ECORE_LIST(list)->nodes) if (ECORE_LIST(list)->index >= ECORE_LIST(list)->nodes)
_ecore_list_last_goto(ECORE_LIST(list)); _ecore_list_last_goto(ECORE_LIST(list));
if (index < ECORE_LIST(list)->index) if (idx < ECORE_LIST(list)->index)
increment = -1; increment = -1;
else else
increment = 1; increment = 1;
for (i = ECORE_LIST(list)->index; i != index; i += increment) for (i = ECORE_LIST(list)->index; i != idx; i += increment)
{ {
if (increment > 0) if (increment > 0)
_ecore_list_next(list); _ecore_list_next(list);

2
legacy/eina/src/tests/eina_bench_hash.c
View File

@ -74,7 +74,6 @@ static void
eina_bench_lookup_rbtree(int request) eina_bench_lookup_rbtree(int request)
{ {
Eina_Rbtree *root = NULL; Eina_Rbtree *root = NULL;
Eina_Rbtree *tmp;
int i; int i;
int j; int j;
@ -96,6 +95,7 @@ eina_bench_lookup_rbtree(int request)
for (j = 0; j < 200; ++j) for (j = 0; j < 200; ++j)
for (i = 0; i < request; ++i) for (i = 0; i < request; ++i)
{ {
Eina_Rbtree *tmp;
char tmp_key[10]; char tmp_key[10];
eina_convert_itoa(rand() % request, tmp_key); eina_convert_itoa(rand() % request, tmp_key);