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

Fix eina_stringshare_shutdown to return value like all eine shutdown funtion. 

Cleanup hash function call.


SVN revision: 35352
This commit is contained in:
Cedric BAIL 2008-08-06 15:49:50 +00:00
parent 69945bf4ec
commit d8ee8aee6c
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/eina/src/include/eina_stringshare.h
View File

@ -9,7 +9,7 @@
*/
EAPI int eina_stringshare_init(void);
EAPI void eina_stringshare_shutdown(void);
EAPI int eina_stringshare_shutdown(void);
EAPI const char *eina_stringshare_add(const char *str);
EAPI void eina_stringshare_del(const char *str);

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

@ -12,6 +12,7 @@
#include "eina_stringshare.h"
#include "eina_error.h"
#include "eina_private.h"
typedef struct _Eina_Stringshare Eina_Stringshare;
typedef struct _Eina_Stringshare_Node Eina_Stringshare_Node;
@ -30,22 +31,6 @@ struct _Eina_Stringshare_Node
static Eina_Stringshare *share = NULL;
static int eina_stringshare_init_count = 0;
static inline int
_eina_stringshare_hash_gen(const char *str, int *len)
{
unsigned int hash_num = 5381;
const unsigned char *ptr;
for (ptr = (const unsigned char *)str; *ptr; ptr++)
{
hash_num = (hash_num * 33) ^ *ptr;
}
hash_num &= 0x3ff;
*len = ptr - (const unsigned char *)str;
return (int)hash_num;
}
/**
* @defgroup Eina_Stringshare_Group String Instance Functions
*
@ -104,7 +89,8 @@ eina_stringshare_add(const char *str)
Eina_Stringshare_Node *el, *pel = NULL;
if (!str) return NULL;
hash_num = _eina_stringshare_hash_gen(str, &slen);
slen = strlen(str) + 1;
hash_num = eina_hash_djb2(str, slen) & 0x3FF;
for (el = share->buckets[hash_num]; el; pel = el, el = el->next)
{
el_str = ((char *)el) + sizeof(Eina_Stringshare_Node);
@ -145,7 +131,8 @@ eina_stringshare_del(const char *str)
Eina_Stringshare_Node *el, *pel = NULL;
if (!str) return;
hash_num = _eina_stringshare_hash_gen(str, &slen);
slen = strlen(str) + 1;
hash_num = eina_hash_djb2(str, slen) & 0x3FF;
for (el = share->buckets[hash_num]; el; pel = el, el = el->next)
{
el_str = ((char *)el) + sizeof(Eina_Stringshare_Node);
@ -177,7 +164,7 @@ eina_stringshare_del(const char *str)
/**
* Shutdown the eina string internal structures
*/
EAPI void
EAPI int
eina_stringshare_shutdown()
{
--eina_stringshare_init_count;
@ -202,5 +189,7 @@ eina_stringshare_shutdown()
eina_error_shutdown();
}
return eina_stringshare_init_count;
}