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

Use memcmp as we know the size of both string. 

SVN revision: 35740
This commit is contained in:
Cedric BAIL 2008-08-29 16:09:39 +00:00
parent ae2b9f2762
commit 1f6ad61f54
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ struct _Eina_Stringshare
struct _Eina_Stringshare_Node
{
Eina_Rbtree node;
int length;
int references;
};
@ -90,15 +91,22 @@ static int
_eina_stringshare_cmp(const Eina_Stringshare_Node *node, const char *key, int length, __UNUSED__ void *data)
{
const char *el_str;
int rlen;
rlen = length < node->length ? length : node->length;
el_str = (const char *) (node + 1);
return strncmp(el_str, key, length);
return memcmp(el_str, key, rlen);
}
static Eina_Rbtree_Direction
_eina_stringshare_node(const Eina_Stringshare_Node *left, const Eina_Stringshare_Node *right, __UNUSED__ void *data)
{
if (strcmp((const char*) (left + 1), (const char*) (right + 1)) < 0)
int rlen;
rlen = left->length < right->length ? left->length : right->length;
if (memcmp((const char*) (left + 1), (const char*) (right + 1), rlen) < 0)
return EINA_RBTREE_LEFT;
return EINA_RBTREE_RIGHT;
}
@ -180,12 +188,13 @@ eina_stringshare_add(const char *str)
return (const char*) (el + 1);
}
el = malloc(sizeof (Eina_Stringshare_Node) + slen + 1);
el = malloc(sizeof (Eina_Stringshare_Node) + slen);
if (!el) return NULL;
el->references = 1;
el->length = slen;
el_str = (char*) (el + 1);
memcpy(el_str, str, slen + 1);
memcpy(el_str, str, slen);
share->buckets[hash_num] = (Eina_Stringshare_Node*) eina_rbtree_inline_insert((Eina_Rbtree*) share->buckets[hash_num], &el->node, EINA_RBTREE_CMP_NODE_CB(_eina_stringshare_node), NULL);