forked from enlightenment/efl
parent
d4e39fd937
commit
7096a69a1e
|
@ -20,6 +20,7 @@ evas_hash_gen(const char *key)
|
|||
return (int)hash_num;
|
||||
}
|
||||
|
||||
/* FIXME: document this file next */
|
||||
Evas_Hash *
|
||||
evas_hash_add(Evas_Hash *hash, const char *key, void *data)
|
||||
{
|
||||
|
@ -51,7 +52,7 @@ evas_hash_add(Evas_Hash *hash, const char *key, void *data)
|
|||
el->key = strdup(key);
|
||||
if (!el->key)
|
||||
{
|
||||
free(key);
|
||||
free(el);
|
||||
_evas_hash_alloc_error = 1;
|
||||
return hash;
|
||||
}
|
||||
|
@ -67,8 +68,8 @@ evas_hash_add(Evas_Hash *hash, const char *key, void *data)
|
|||
if (evas_list_alloc_error())
|
||||
{
|
||||
_evas_hash_alloc_error = 1;
|
||||
free(el->key);
|
||||
free(key);
|
||||
if (el->key) free(el->key);
|
||||
free(el);
|
||||
return hash;
|
||||
}
|
||||
hash->population++;
|
||||
|
@ -123,6 +124,7 @@ evas_hash_find(Evas_Hash *hash, const char *key)
|
|||
{
|
||||
if (l != hash->buckets[hash_num])
|
||||
{
|
||||
/* FIXME: move to front of list without alloc */
|
||||
hash->buckets[hash_num] = evas_object_list_remove(hash->buckets[hash_num], el);
|
||||
hash->buckets[hash_num] = evas_object_list_prepend(hash->buckets[hash_num], el);
|
||||
if (evas_list_alloc_error())
|
||||
|
@ -183,7 +185,7 @@ evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key
|
|||
|
||||
next_l = l->next;
|
||||
el = (Evas_Hash_El *)l;
|
||||
func(hash, el->key, el->data, fdata);
|
||||
if (!func(hash, el->key, el->data, fdata)) return;
|
||||
l = next_l;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -226,7 +226,7 @@ evas_engine_gl_x11_output_setup(int w, int h, int rot, Display *disp, Drawable d
|
|||
draw_init();
|
||||
tilebuf_init();
|
||||
|
||||
x_gl_x11_init();
|
||||
evas_gl_x11_init();
|
||||
|
||||
return re;
|
||||
}
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
/* data structs go here for engine internals */
|
||||
|
||||
/****/
|
||||
void x_gl_x11_init (void);
|
||||
void evas_gl_x11_init (void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
#include <X11/Xutil.h>
|
||||
|
||||
void
|
||||
x_gl_x11_init(void)
|
||||
evas_gl_x11_init(void)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -532,19 +532,26 @@ Evas_List *evas_list_prepend_relative (Evas_List *list, void *data, void *rela
|
|||
Evas_List *evas_list_remove (Evas_List *list, void *data);
|
||||
Evas_List *evas_list_remove_list (Evas_List *list, Evas_List *remove_list);
|
||||
void *evas_list_find (Evas_List *list, void *data);
|
||||
Evas_List *evas_list_find_list (Evas_List *list, void *data);
|
||||
Evas_List *evas_list_free (Evas_List *list);
|
||||
Evas_List *evas_list_last (Evas_List *list);
|
||||
Evas_List *evas_list_next (Evas_List *list);
|
||||
Evas_List *evas_list_prev (Evas_List *list);
|
||||
void *evas_list_data (Evas_List *list);
|
||||
int evas_list_count (Evas_List *list);
|
||||
void *evas_list_nth (Evas_List *list, int n);
|
||||
Evas_List *evas_list_nth_list (Evas_List *list, int n);
|
||||
Evas_List *evas_list_reverse (Evas_List *list);
|
||||
|
||||
int evas_list_alloc_error (void);
|
||||
|
||||
Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, void *data);
|
||||
Evas_Hash *evas_hash_del (Evas_Hash *hash, const char *key, void *data);
|
||||
void *evas_hash_find (Evas_Hash *hash, const char *key);
|
||||
int evas_hash_size (Evas_Hash *hash);
|
||||
void evas_hash_free (Evas_Hash *hash);
|
||||
void evas_hash_foreach (Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), void *fdata);
|
||||
|
||||
int evas_hash_alloc_error (void);
|
||||
|
||||
void *evas_object_list_append (void *in_list, void *in_item);
|
||||
void *evas_object_list_prepend (void *in_list, void *in_item);
|
||||
void *evas_object_list_append_relative (void *in_list, void *in_item, void *in_relative);
|
||||
|
|
Loading…
Reference in New Issue