variable name changes for accessor functions

patch by vtorry
compile testing frowned upon by andredieb


SVN revision: 52163
This commit is contained in:
Mike Blumenkrantz 2010-09-12 06:49:57 +00:00
parent d32c0f99bd
commit eb775222a5
3 changed files with 36 additions and 36 deletions

View File

@ -694,31 +694,31 @@ eina_array_iterator_new(const Eina_Array *array)
EAPI Eina_Accessor * EAPI Eina_Accessor *
eina_array_accessor_new(const Eina_Array *array) eina_array_accessor_new(const Eina_Array *array)
{ {
Eina_Accessor_Array *it; Eina_Accessor_Array *ac;
EINA_SAFETY_ON_NULL_RETURN_VAL(array, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(array, NULL);
EINA_MAGIC_CHECK_ARRAY(array); EINA_MAGIC_CHECK_ARRAY(array);
eina_error_set(0); eina_error_set(0);
it = calloc(1, sizeof (Eina_Accessor_Array)); ac = calloc(1, sizeof (Eina_Accessor_Array));
if (!it) if (!ac)
{ {
eina_error_set(EINA_ERROR_OUT_OF_MEMORY); eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
return NULL; return NULL;
} }
EINA_MAGIC_SET(it, EINA_MAGIC_ARRAY_ACCESSOR); EINA_MAGIC_SET(ac, EINA_MAGIC_ARRAY_ACCESSOR);
EINA_MAGIC_SET(&it->accessor, EINA_MAGIC_ACCESSOR); EINA_MAGIC_SET(&ac->accessor, EINA_MAGIC_ACCESSOR);
it->array = array; ac->array = array;
it->accessor.version = EINA_ACCESSOR_VERSION; ac->accessor.version = EINA_ACCESSOR_VERSION;
it->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_array_accessor_get_at); ac->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_array_accessor_get_at);
it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER( ac->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(
eina_array_accessor_get_container); eina_array_accessor_get_container);
it->accessor.free = FUNC_ACCESSOR_FREE(eina_array_accessor_free); ac->accessor.free = FUNC_ACCESSOR_FREE(eina_array_accessor_free);
return &it->accessor; return &ac->accessor;
} }
/** /**

View File

@ -663,29 +663,29 @@ eina_inlist_iterator_new(const Eina_Inlist *list)
EAPI Eina_Accessor * EAPI Eina_Accessor *
eina_inlist_accessor_new(const Eina_Inlist *list) eina_inlist_accessor_new(const Eina_Inlist *list)
{ {
Eina_Accessor_Inlist *it; Eina_Accessor_Inlist *ac;
eina_error_set(0); eina_error_set(0);
it = calloc(1, sizeof (Eina_Accessor_Inlist)); ac = calloc(1, sizeof (Eina_Accessor_Inlist));
if (!it) if (!ac)
{ {
eina_error_set(EINA_ERROR_OUT_OF_MEMORY); eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
return NULL; return NULL;
} }
it->head = list; ac->head = list;
it->current = list; ac->current = list;
it->index = 0; ac->index = 0;
it->accessor.version = EINA_ACCESSOR_VERSION; ac->accessor.version = EINA_ACCESSOR_VERSION;
it->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_inlist_accessor_get_at); ac->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_inlist_accessor_get_at);
it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER( ac->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(
eina_inlist_accessor_get_container); eina_inlist_accessor_get_container);
it->accessor.free = FUNC_ACCESSOR_FREE(eina_inlist_accessor_free); ac->accessor.free = FUNC_ACCESSOR_FREE(eina_inlist_accessor_free);
EINA_MAGIC_SET(&it->accessor, EINA_MAGIC_ACCESSOR); EINA_MAGIC_SET(&ac->accessor, EINA_MAGIC_ACCESSOR);
return &it->accessor; return &ac->accessor;
} }
/** /**

View File

@ -2152,30 +2152,30 @@ eina_list_iterator_reversed_new(const Eina_List *list)
EAPI Eina_Accessor * EAPI Eina_Accessor *
eina_list_accessor_new(const Eina_List *list) eina_list_accessor_new(const Eina_List *list)
{ {
Eina_Accessor_List *it; Eina_Accessor_List *ac;
eina_error_set(0); eina_error_set(0);
it = calloc(1, sizeof (Eina_Accessor_List)); ac = calloc(1, sizeof (Eina_Accessor_List));
if (!it) if (!ac)
{ {
eina_error_set(EINA_ERROR_OUT_OF_MEMORY); eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
return NULL; return NULL;
} }
EINA_MAGIC_SET(it, EINA_MAGIC_LIST_ACCESSOR); EINA_MAGIC_SET(ac, EINA_MAGIC_LIST_ACCESSOR);
EINA_MAGIC_SET(&it->accessor, EINA_MAGIC_ACCESSOR); EINA_MAGIC_SET(&ac->accessor, EINA_MAGIC_ACCESSOR);
it->head = list; ac->head = list;
it->current = list; ac->current = list;
it->index = 0; ac->index = 0;
it->accessor.version = EINA_ACCESSOR_VERSION; ac->accessor.version = EINA_ACCESSOR_VERSION;
it->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_list_accessor_get_at); ac->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_list_accessor_get_at);
it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER( ac->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(
eina_list_accessor_get_container); eina_list_accessor_get_container);
it->accessor.free = FUNC_ACCESSOR_FREE(eina_list_accessor_free); ac->accessor.free = FUNC_ACCESSOR_FREE(eina_list_accessor_free);
return &it->accessor; return &ac->accessor;
} }
/** /**