forked from enlightenment/efl
formatting
someone RECENTLY edited this file with tabs. stop it. seriously. SVN revision: 73155
This commit is contained in:
parent
a45fd44206
commit
005f6ba959
|
@ -43,8 +43,8 @@
|
|||
#include "eina_hash.h"
|
||||
|
||||
/*============================================================================*
|
||||
* Local *
|
||||
*============================================================================*/
|
||||
* Local *
|
||||
*============================================================================*/
|
||||
|
||||
/**
|
||||
* @cond LOCAL
|
||||
|
@ -54,7 +54,7 @@
|
|||
do { \
|
||||
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH)) { \
|
||||
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH); } \
|
||||
} while(0)
|
||||
} while (0)
|
||||
|
||||
#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, ...) \
|
||||
do { \
|
||||
|
@ -63,7 +63,7 @@
|
|||
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR); \
|
||||
return __VA_ARGS__; \
|
||||
} \
|
||||
} while(0)
|
||||
} while (0)
|
||||
|
||||
#define EINA_HASH_BUCKET_SIZE 8
|
||||
#define EINA_HASH_SMALL_BUCKET_SIZE 5
|
||||
|
@ -622,13 +622,13 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
|
|||
}
|
||||
else
|
||||
{
|
||||
ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element);
|
||||
ok = eina_iterator_next(it->list, (void **)(void *)&it->hash_element);
|
||||
if (!ok)
|
||||
{
|
||||
eina_iterator_free(it->list);
|
||||
it->list = NULL;
|
||||
|
||||
ok = eina_iterator_next(it->current, (void **)(void*)&it->hash_head);
|
||||
ok = eina_iterator_next(it->current, (void **)(void *)&it->hash_head);
|
||||
if (!ok)
|
||||
{
|
||||
eina_iterator_free(it->current);
|
||||
|
@ -638,7 +638,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
|
|||
else
|
||||
{
|
||||
it->list = eina_rbtree_iterator_prefix(it->hash_head->head);
|
||||
ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element);
|
||||
ok = eina_iterator_next(it->list, (void **)(void *)&it->hash_element);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -653,7 +653,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
|
|||
{
|
||||
it->current =
|
||||
eina_rbtree_iterator_prefix(it->hash->buckets[bucket]);
|
||||
ok = eina_iterator_next(it->current, (void **)(void*)&it->hash_head);
|
||||
ok = eina_iterator_next(it->current, (void **)(void *)&it->hash_head);
|
||||
if (ok)
|
||||
break;
|
||||
|
||||
|
@ -667,7 +667,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
|
|||
eina_iterator_free(it->list);
|
||||
|
||||
it->list = eina_rbtree_iterator_prefix(it->hash_head->head);
|
||||
ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element);
|
||||
ok = eina_iterator_next(it->list, (void **)(void *)&it->hash_element);
|
||||
if (bucket == it->hash->size)
|
||||
ok = EINA_FALSE;
|
||||
}
|
||||
|
@ -706,12 +706,12 @@ _eina_hash_iterator_free(Eina_Iterator_Hash *it)
|
|||
*/
|
||||
|
||||
/*============================================================================*
|
||||
* Global *
|
||||
*============================================================================*/
|
||||
* Global *
|
||||
*============================================================================*/
|
||||
|
||||
/*============================================================================*
|
||||
* API *
|
||||
*============================================================================*/
|
||||
* API *
|
||||
*============================================================================*/
|
||||
|
||||
EAPI void
|
||||
eina_hash_free_cb_set(Eina_Hash *hash, Eina_Free_Cb data_free_cb)
|
||||
|
@ -854,7 +854,7 @@ eina_hash_free(Eina_Hash *hash)
|
|||
{
|
||||
int i;
|
||||
|
||||
if (!hash) return ;
|
||||
if (!hash) return;
|
||||
|
||||
EINA_MAGIC_CHECK_HASH(hash);
|
||||
|
||||
|
@ -872,7 +872,7 @@ eina_hash_free_buckets(Eina_Hash *hash)
|
|||
{
|
||||
int i;
|
||||
|
||||
if (!hash) return ;
|
||||
if (!hash) return;
|
||||
|
||||
EINA_MAGIC_CHECK_HASH(hash);
|
||||
|
||||
|
@ -1155,6 +1155,7 @@ eina_hash_set(Eina_Hash *hash, const void *key, const void *data)
|
|||
data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void *
|
||||
eina_hash_modify(Eina_Hash *hash, const void *key, const void *data)
|
||||
{
|
||||
|
@ -1378,3 +1379,4 @@ eina_hash_superfast(const char *key, int len)
|
|||
|
||||
return hash;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue