enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

* eina: add a way to move a key to another without triggering the Free_Cb. 

SVN revision: 50683
This commit is contained in:
Cedric BAIL 2010-07-30 09:06:58 +00:00
parent 7c45637e38
commit c9d5d8a62e
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/eina/src/include/eina_hash.h
View File

@ -122,6 +122,12 @@ eina_hash_set(
Eina_Hash *hash,
const void *key,
const void *data) EINA_ARG_NONNULL(1, 2, 3);
EAPI Eina_Bool
eina_hash_move(
Eina_Hash *hash,
const void *old_key,
const void *new_key) EINA_ARG_NONNULL(1, 2, 3);
EAPI void
eina_hash_free(
Eina_Hash *hash) EINA_ARG_NONNULL(1);

34
legacy/eina/src/lib/eina_hash.c
View File

@ -1483,6 +1483,40 @@ eina_hash_modify(Eina_Hash *hash, const void *key, const void *data)
return eina_hash_modify_by_hash(hash, key, key_length, hash_num, data);
}
/**
* Change the key associated with a data without trigerring the del callback.
* @param hash The given hash table.
* @param old_key The current key associated with the data
* @param new_key The new key to associate data with
* @return EINA_FALSE if somethings goes wrong.
*/
EAPI Eina_Bool
eina_hash_move(Eina_Hash *hash, const void *old_key, const void *new_key)
{
Eina_Free_Cb hash_free_cb;
const void *data;
Eina_Bool result;
EINA_MAGIC_CHECK_HASH(hash);
EINA_SAFETY_ON_NULL_RETURN_VAL(hash, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(hash->key_hash_cb, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(old_key, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(new_key, EINA_FALSE);
data = eina_hash_find(hash, old_key);
if (!data) return EINA_FALSE;
hash_free_cb = hash->data_free_cb;
hash->data_free_cb = NULL;
eina_hash_del(hash, old_key, data);
result = eina_hash_add(hash, new_key, data);
hash->data_free_cb = hash_free_cb;
return result;
}
/*============================================================================*
* Iterator *
*============================================================================*/