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

* eina: Allow compilation with -Wshadow. 

Patch from Albin Tonerre.


SVN revision: 45497
This commit is contained in:
Cedric BAIL 2010-01-23 19:53:27 +00:00
parent 6833eadf64
commit a9a3813966
9 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/eina/src/include/eina_array.h
View File

@ -82,8 +82,8 @@ EAPI Eina_Bool eina_array_remove (Eina_Array *array, Eina_Bool (*keep)(void
static inline Eina_Bool eina_array_push (Eina_Array *array, const void *data) EINA_ARG_NONNULL(1, 2); static inline Eina_Bool eina_array_push (Eina_Array *array, const void *data) EINA_ARG_NONNULL(1, 2);
static inline void *eina_array_pop (Eina_Array *array) EINA_ARG_NONNULL(1); static inline void *eina_array_pop (Eina_Array *array) EINA_ARG_NONNULL(1);
static inline void *eina_array_data_get (const Eina_Array *array, unsigned int index) EINA_ARG_NONNULL(1) EINA_PURE; static inline void *eina_array_data_get (const Eina_Array *array, unsigned int idx) EINA_ARG_NONNULL(1) EINA_PURE;
static inline void eina_array_data_set (const Eina_Array *array, unsigned int index, const void *data) EINA_ARG_NONNULL(1, 3); static inline void eina_array_data_set (const Eina_Array *array, unsigned int idx, const void *data) EINA_ARG_NONNULL(1, 3);
static inline unsigned int eina_array_count_get (const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_PURE; static inline unsigned int eina_array_count_get (const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_PURE;
EAPI Eina_Iterator *eina_array_iterator_new (const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI Eina_Iterator *eina_array_iterator_new (const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;

20
legacy/eina/src/include/eina_inline_array.x
View File

@ -87,34 +87,34 @@ eina_array_pop(Eina_Array *array)
* @brief Return the data at a given position in an array. * @brief Return the data at a given position in an array.
* *
* @param array The array. * @param array The array.
* @param index The potition of the data to retrieve. * @param idx The potition of the data to retrieve.
* @return The retrieved data. * @return The retrieved data.
* *
* This function returns the data at the position @p index in @p * This function returns the data at the position @p idx in @p
* array. For performance reasons, there is no check of @p array or @p * array. For performance reasons, there is no check of @p array or @p
* index. If it is @c NULL or invalid, the program may crash. * idx. If it is @c NULL or invalid, the program may crash.
*/ */
static inline void * static inline void *
eina_array_data_get(const Eina_Array *array, unsigned int index) eina_array_data_get(const Eina_Array *array, unsigned int idx)
{ {
return array->data[index]; return array->data[idx];
} }
/** /**
* @brief Return the data at a given position in an array. * @brief Return the data at a given position in an array.
* *
* @param array The array. * @param array The array.
* @param index The potition of the data to set. * @param idx The potition of the data to set.
* @param data The data to set. * @param data The data to set.
* *
* This function returns the data at the position @p index in @p * This function returns the data at the position @p idx in @p
* array. For performance reasons, there is no check of @p array or @p * array. For performance reasons, there is no check of @p array or @p
* index. If it is @c NULL or invalid, the program may crash. * idx. If it is @c NULL or invalid, the program may crash.
*/ */
static inline void static inline void
eina_array_data_set(const Eina_Array *array, unsigned int index, const void *data) eina_array_data_set(const Eina_Array *array, unsigned int idx, const void *data)
{ {
array->data[index] = (void*) data; array->data[idx] = (void*) data;
} }
/** /**

8
legacy/eina/src/lib/eina_array.c
View File

@ -198,7 +198,7 @@ static void eina_array_iterator_free(Eina_Iterator_Array *it) EINA_ARG_NONNULL(1
static Eina_Array *eina_array_iterator_get_container(Eina_Iterator_Array *it) EINA_ARG_NONNULL(1); static Eina_Array *eina_array_iterator_get_container(Eina_Iterator_Array *it) EINA_ARG_NONNULL(1);
static Eina_Bool eina_array_iterator_next(Eina_Iterator_Array *it, void **data) EINA_ARG_NONNULL(1); static Eina_Bool eina_array_iterator_next(Eina_Iterator_Array *it, void **data) EINA_ARG_NONNULL(1);
static Eina_Bool eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **data) EINA_ARG_NONNULL(1); static Eina_Bool eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int idx, void **data) EINA_ARG_NONNULL(1);
static Eina_Array *eina_array_accessor_get_container(Eina_Accessor_Array *it) EINA_ARG_NONNULL(1); static Eina_Array *eina_array_accessor_get_container(Eina_Accessor_Array *it) EINA_ARG_NONNULL(1);
static void eina_array_accessor_free(Eina_Accessor_Array *it) EINA_ARG_NONNULL(1); static void eina_array_accessor_free(Eina_Accessor_Array *it) EINA_ARG_NONNULL(1);
@ -230,14 +230,14 @@ eina_array_iterator_free(Eina_Iterator_Array *it)
} }
static Eina_Bool static Eina_Bool
eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **data) eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int idx, void **data)
{ {
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, EINA_FALSE); EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, EINA_FALSE);
if (!(index < eina_array_count_get(it->array))) if (!(idx < eina_array_count_get(it->array)))
return EINA_FALSE; return EINA_FALSE;
if (data) if (data)
*data = eina_array_data_get(it->array, index); *data = eina_array_data_get(it->array, idx);
return EINA_TRUE; return EINA_TRUE;
} }

4
legacy/eina/src/lib/eina_counter.c
View File

@ -331,10 +331,10 @@ eina_counter_free(Eina_Counter *counter)
while (counter->clocks) while (counter->clocks)
{ {
Eina_Clock *clock = (Eina_Clock *) counter->clocks; Eina_Clock *clk = (Eina_Clock *) counter->clocks;
counter->clocks = eina_inlist_remove(counter->clocks, counter->clocks); counter->clocks = eina_inlist_remove(counter->clocks, counter->clocks);
free(clock); free(clk);
} }
free(counter); free(counter);

1
legacy/eina/src/lib/eina_cpu.c
View File

@ -72,6 +72,7 @@ static inline void _x86_cpuid(int op, int *a, int *b, int *c, int *d)
: "cc"); : "cc");
} }
static
void _x86_simd(Eina_Cpu_Features *features) void _x86_simd(Eina_Cpu_Features *features)
{ {
int a, b, c, d; int a, b, c, d;

22
legacy/eina/src/lib/eina_list.c
View File

@ -307,7 +307,7 @@ eina_list_iterator_free(Eina_Iterator_List *it)
} }
static Eina_Bool static Eina_Bool
eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **data) eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int idx, void **data)
{ {
const Eina_List *over; const Eina_List *over;
unsigned int middle; unsigned int middle;
@ -315,22 +315,22 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **dat
EINA_MAGIC_CHECK_LIST_ACCESSOR(it, EINA_FALSE); EINA_MAGIC_CHECK_LIST_ACCESSOR(it, EINA_FALSE);
if (index >= eina_list_count(it->head)) return EINA_FALSE; if (idx >= eina_list_count(it->head)) return EINA_FALSE;
if (it->index == index) if (it->index == idx)
{ {
over = it->current; over = it->current;
} }
else if (index > it->index) else if (idx > it->index)
{ {
/* After current position. */ /* After current position. */
middle = ((eina_list_count(it->head) - it->index) >> 1) + it->index; middle = ((eina_list_count(it->head) - it->index) >> 1) + it->index;
if (index > middle) if (idx > middle)
{ {
/* Go backward from the end. */ /* Go backward from the end. */
for (i = eina_list_count(it->head) - 1, over = eina_list_last(it->head); for (i = eina_list_count(it->head) - 1, over = eina_list_last(it->head);
i > index && over != NULL; i > idx && over != NULL;
--i, over = eina_list_prev(over)) --i, over = eina_list_prev(over))
; ;
} }
@ -338,7 +338,7 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **dat
{ {
/* Go forward from current. */ /* Go forward from current. */
for (i = it->index, over = it->current; for (i = it->index, over = it->current;
i < index && over != NULL; i < idx && over != NULL;
++i, over = eina_list_next(over)) ++i, over = eina_list_next(over))
; ;
} }
@ -348,11 +348,11 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **dat
/* Before current position. */ /* Before current position. */
middle = it->index >> 1; middle = it->index >> 1;
if (index > middle) if (idx > middle)
{ {
/* Go backward from current. */ /* Go backward from current. */
for (i = it->index, over = it->current; for (i = it->index, over = it->current;
i > index && over != NULL; i > idx && over != NULL;
--i, over = eina_list_prev(over)) --i, over = eina_list_prev(over))
; ;
} }
@ -360,7 +360,7 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **dat
{ {
/* Go forward from start. */ /* Go forward from start. */
for (i = 0, over = it->head; for (i = 0, over = it->head;
i < index && over != NULL; i < idx && over != NULL;
++i, over = eina_list_next(over)) ++i, over = eina_list_next(over))
; ;
} }
@ -369,7 +369,7 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **dat
if (over == NULL) return EINA_FALSE; if (over == NULL) return EINA_FALSE;
it->current = over; it->current = over;
it->index = index; it->index = idx;
*data = eina_list_data_get(it->current); *data = eina_list_data_get(it->current);
return EINA_TRUE; return EINA_TRUE;

1
legacy/eina/src/lib/eina_module.c
View File

@ -139,7 +139,6 @@ static void _dir_list_cb(const char *name, const char *path, void *data)
{ {
char *file; char *file;
Eina_Module *m; Eina_Module *m;
size_t length;
length = strlen(path) + strlen(name) + 2; length = strlen(path) + strlen(name) + 2;

46
legacy/eina/src/lib/eina_stringshare.c
View File

@ -445,7 +445,7 @@ _eina_stringshare_small_cmp(const Eina_Stringshare_Small_Bucket *bucket, int i,
} }
static const char * static const char *
_eina_stringshare_small_bucket_find(const Eina_Stringshare_Small_Bucket *bucket, const char *str, unsigned char length, int *index) _eina_stringshare_small_bucket_find(const Eina_Stringshare_Small_Bucket *bucket, const char *str, unsigned char length, int *idx)
{ {
const char *pstr = str + 1; /* skip first letter, it's always the same */ const char *pstr = str + 1; /* skip first letter, it's always the same */
unsigned char plength = length - 1; unsigned char plength = length - 1;
@ -453,7 +453,7 @@ _eina_stringshare_small_bucket_find(const Eina_Stringshare_Small_Bucket *bucket,
if (bucket->count == 0) if (bucket->count == 0)
{ {
*index = 0; *idx = 0;
return NULL; return NULL;
} }
@ -477,12 +477,12 @@ _eina_stringshare_small_bucket_find(const Eina_Stringshare_Small_Bucket *bucket,
} }
else else
{ {
*index = i; *idx = i;
return bucket->strings[i]; return bucket->strings[i];
} }
} }
*index = low; *idx = low;
return NULL; return NULL;
} }
@ -520,7 +520,7 @@ _eina_stringshare_small_bucket_resize(Eina_Stringshare_Small_Bucket *bucket, int
} }
static const char * static const char *
_eina_stringshare_small_bucket_insert_at(Eina_Stringshare_Small_Bucket **p_bucket, const char *str, unsigned char length, int index) _eina_stringshare_small_bucket_insert_at(Eina_Stringshare_Small_Bucket **p_bucket, const char *str, unsigned char length, int idx)
{ {
Eina_Stringshare_Small_Bucket *bucket = *p_bucket; Eina_Stringshare_Small_Bucket *bucket = *p_bucket;
int todo, off; int todo, off;
@ -552,39 +552,39 @@ _eina_stringshare_small_bucket_insert_at(Eina_Stringshare_Small_Bucket **p_bucke
memcpy(snew, str, length); memcpy(snew, str, length);
snew[length] = '\0'; snew[length] = '\0';
off = index + 1; off = idx + 1;
todo = bucket->count - index; todo = bucket->count - idx;
if (todo > 0) if (todo > 0)
{ {
memmove((void *)(bucket->strings + off), bucket->strings + index, memmove((void *)(bucket->strings + off), bucket->strings + idx,
todo * sizeof(bucket->strings[0])); todo * sizeof(bucket->strings[0]));
memmove(bucket->lengths + off, bucket->lengths + index, memmove(bucket->lengths + off, bucket->lengths + idx,
todo * sizeof(bucket->lengths[0])); todo * sizeof(bucket->lengths[0]));
memmove(bucket->references + off, bucket->references + index, memmove(bucket->references + off, bucket->references + idx,
todo * sizeof(bucket->references[0])); todo * sizeof(bucket->references[0]));
} }
bucket->strings[index] = snew; bucket->strings[idx] = snew;
bucket->lengths[index] = length; bucket->lengths[idx] = length;
bucket->references[index] = 1; bucket->references[idx] = 1;
bucket->count++; bucket->count++;
return snew; return snew;
} }
static void static void
_eina_stringshare_small_bucket_remove_at(Eina_Stringshare_Small_Bucket **p_bucket, int index) _eina_stringshare_small_bucket_remove_at(Eina_Stringshare_Small_Bucket **p_bucket, int idx)
{ {
Eina_Stringshare_Small_Bucket *bucket = *p_bucket; Eina_Stringshare_Small_Bucket *bucket = *p_bucket;
int todo, off; int todo, off;
if (bucket->references[index] > 1) if (bucket->references[idx] > 1)
{ {
bucket->references[index]--; bucket->references[idx]--;
return; return;
} }
free((char *)bucket->strings[index]); free((char *)bucket->strings[idx]);
if (bucket->count == 1) if (bucket->count == 1)
{ {
@ -597,17 +597,17 @@ _eina_stringshare_small_bucket_remove_at(Eina_Stringshare_Small_Bucket **p_bucke
} }
bucket->count--; bucket->count--;
if (index == bucket->count) if (idx == bucket->count)
goto end; goto end;
off = index + 1; off = idx + 1;
todo = bucket->count - index; todo = bucket->count - idx;
memmove((void *)(bucket->strings + index), bucket->strings + off, memmove((void *)(bucket->strings + idx), bucket->strings + off,
todo * sizeof(bucket->strings[0])); todo * sizeof(bucket->strings[0]));
memmove(bucket->lengths + index, bucket->lengths + off, memmove(bucket->lengths + idx, bucket->lengths + off,
todo * sizeof(bucket->lengths[0])); todo * sizeof(bucket->lengths[0]));
memmove(bucket->references + index, bucket->references + off, memmove(bucket->references + idx, bucket->references + off,
todo * sizeof(bucket->references[0])); todo * sizeof(bucket->references[0]));
end: end:

8
legacy/eina/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c
View File

@ -108,7 +108,7 @@ eina_fixed_bitmap_malloc(void *data, __UNUSED__ unsigned int size)
Eina_Fixed_Bitmap *mp = data; Eina_Fixed_Bitmap *mp = data;
Eina_Fixed_Bitmap_Pool *pool = NULL; Eina_Fixed_Bitmap_Pool *pool = NULL;
void *ptr; void *ptr;
int index; int idx;
if (mp->head) if (mp->head)
{ {
@ -133,9 +133,9 @@ eina_fixed_bitmap_malloc(void *data, __UNUSED__ unsigned int size)
mp->lookup = eina_rbtree_inline_insert(mp->lookup, EINA_RBTREE_GET(pool), EINA_RBTREE_CMP_NODE_CB(_eina_fixed_cmp), NULL); mp->lookup = eina_rbtree_inline_insert(mp->lookup, EINA_RBTREE_GET(pool), EINA_RBTREE_CMP_NODE_CB(_eina_fixed_cmp), NULL);
} }
index = ffs(pool->bitmask) - 1; idx = ffs(pool->bitmask) - 1;
pool->bitmask &= ~(1 << index); pool->bitmask &= ~(1 << idx);
ptr = (unsigned char*) (pool + 1) + index * mp->item_size; ptr = (unsigned char*) (pool + 1) + idx * mp->item_size;
if (pool->bitmask == 0) if (pool->bitmask == 0)
mp->head = eina_inlist_demote(mp->head, EINA_INLIST_GET(pool)); mp->head = eina_inlist_demote(mp->head, EINA_INLIST_GET(pool));