Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
Ecore_Data.h ecore_hash.c ecore_list.c ecore_path.c
ecore_plugin.c ecore_sheap.c ecore_strings.c ecore_tree.c
Log Message:
*API BREAK* see the discussion in the mailing list. misc and e_modules will
follow
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/Ecore_Data.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Ecore_Data.h 27 Jun 2007 10:57:54 -0000 1.45
+++ Ecore_Data.h 25 Jul 2007 17:00:54 -0000 1.46
@@ -25,6 +25,38 @@
/* we need this for size_t */
#include <stddef.h>
+/* NOTE: these aliases will be removed! DO NOT USE THEM! */
+#define ecore_list_nodes(l) ecore_list_count(l)
+#define ecore_list_is_empty(l) ecore_list_empty_is(l)
+#define ecore_list_set_free_cb(l, f) ecore_list_free_cb_set(l, f)
+#define ecore_dlist_nodes(l) ecore_dlist_count(l)
+#define ecore_dlist_is_empty(l) ecore_dlist_empty_is(l)
+#define ecore_dlist_set_free_cb(l, f) ecore_dlist_free_cb_set(l, f)
+#define ecore_hash_set_free_key(l, f) ecore_hash_free_key_cb_set(l, f)
+#define ecore_hash_set_free_value(l, f) ecore_hash_free_value_cb_set(l, f)
+#define ecore_hash_set_hash(l, k, v) ecore_hash_hash_set(l, k, v)
+#define ecore_plugin_get_available(id) ecore_plugin_available_get(id)
+#define ecore_sheap_set_free_cb(s, f) ecore_sheap_free_cb_set(s, f)
+#define ecore_sheap_set_compare(s, f) ecore_sheap_compare_set(s, f)
+#define ecore_sheap_set_order(s, o) ecore_sheap_order_set(s, o)
+#define ecore_tree_is_empty(t) ecore_tree_empty_is(t)
+#define ecore_tree_get_closest_larger(t) ecore_tree_closest_larger_get(t)
+#define ecore_tree_get_closest_smaller(t) ecore_tree_closest_smaller_get(t)
+#define ecore_tree_add_node(t, n) ecore_tree_node_add(t, n);
+#define ecore_tree_remove_node(t, n) ecore_tree_node_remove(t, n)
+#define ecore_tree_set_free_value(t, f) ecore_tree_free_value_cb_set(t, f)
+#define ecore_tree_set_free_key(t, f) ecore_tree_free_key_cb_set(t, f)
+#define ecore_list_remove_first(l) ecore_list_first_remove(l)
+#define ecore_list_remove_last(l) ecore_list_last_remove(l)
+#define ecore_list_goto_first(l) ecore_list_first_goto(l)
+#define ecore_list_goto_last(l) ecore_list_last_goto(l)
+#define ecore_list_goto_index(l) ecore_list_index_goto(l)
+#define ecore_dlist_remove_first(l) ecore_dlist_first_remove(l)
+#define ecore_dlist_remove_last(l) ecore_dlist_last_remove(l)
+#define ecore_dlist_goto_first(l) ecore_dlist_first_goto(l)
+#define ecore_dlist_goto_last(l) ecore_dlist_last_goto(l)
+#define ecore_dlist_goto_index(l) ecore_dlist_index_goto(l)
+
/**
* @file Ecore_Data.h
* @brief Contains threading, list, hash, debugging and tree functions.
@@ -104,22 +136,22 @@
/* Removing items from the list */
EAPI int ecore_list_remove_destroy(Ecore_List *list);
EAPI void *ecore_list_remove(Ecore_List * list);
- EAPI void *ecore_list_remove_first(Ecore_List * list);
- EAPI void *ecore_list_remove_last(Ecore_List * list);
+ EAPI void *ecore_list_first_remove(Ecore_List * list);
+ EAPI void *ecore_list_last_remove(Ecore_List * list);
/* Retrieve the current position in the list */
EAPI void *ecore_list_current(Ecore_List * list);
EAPI void *ecore_list_first(Ecore_List * list);
EAPI void *ecore_list_last(Ecore_List * list);
EAPI int ecore_list_index(Ecore_List * list);
- EAPI int ecore_list_nodes(Ecore_List * list);
+ EAPI int ecore_list_count(Ecore_List * list);
/* Traversing the list */
EAPI int ecore_list_for_each(Ecore_List *list, Ecore_For_Each function,
void *user_data);
- EAPI void *ecore_list_goto_first(Ecore_List * list);
- EAPI void *ecore_list_goto_last(Ecore_List * list);
- EAPI void *ecore_list_goto_index(Ecore_List * list, int index);
+ EAPI void *ecore_list_first_goto(Ecore_List * list);
+ EAPI void *ecore_list_last_goto(Ecore_List * list);
+ EAPI void *ecore_list_index_goto(Ecore_List * list, int index);
EAPI void *ecore_list_goto(Ecore_List * list, const void *_data);
/* Traversing the list and returning data */
@@ -136,7 +168,7 @@
char order);
/* Check to see if there is any data in the list */
- EAPI int ecore_list_is_empty(Ecore_List * list);
+ EAPI int ecore_list_empty_is(Ecore_List * list);
/* Remove every node in the list without freeing the list itself */
EAPI int ecore_list_clear(Ecore_List * list);
@@ -150,7 +182,7 @@
/* Destroying nodes */
EAPI int ecore_list_node_destroy(Ecore_List_Node * _e_node, Ecore_Free_Cb
free_func);
- EAPI int ecore_list_set_free_cb(Ecore_List * list, Ecore_Free_Cb free_func);
+ EAPI int ecore_list_free_cb_set(Ecore_List * list, Ecore_Free_Cb free_func);
typedef Ecore_List Ecore_DList;
# define ECORE_DLIST(dlist) ((Ecore_DList *)dlist)
@@ -178,20 +210,20 @@
/* Info about list's state */
EAPI void *ecore_dlist_current(Ecore_DList *list);
EAPI int ecore_dlist_index(Ecore_DList *list);
-# define ecore_dlist_nodes(list) ecore_list_nodes(ECORE_LIST(list))
+# define ecore_dlist_count(list) ecore_list_count(ECORE_LIST(list))
/* Removing items from the list */
EAPI void *ecore_dlist_remove(Ecore_DList * _e_dlist);
- EAPI void *ecore_dlist_remove_first(Ecore_DList * _e_dlist);
+ EAPI void *ecore_dlist_first_remove(Ecore_DList * _e_dlist);
EAPI int ecore_dlist_remove_destroy(Ecore_DList *list);
- EAPI void *ecore_dlist_remove_last(Ecore_DList * _e_dlist);
+ EAPI void *ecore_dlist_last_remove(Ecore_DList * _e_dlist);
/* Traversing the list */
# define ecore_dlist_for_each(list, function, user_data) \
ecore_list_for_each(ECORE_LIST(list), function, user_data)
- EAPI void *ecore_dlist_goto_first(Ecore_DList * _e_dlist);
- EAPI void *ecore_dlist_goto_last(Ecore_DList * _e_dlist);
- EAPI void *ecore_dlist_goto_index(Ecore_DList * _e_dlist, int index);
+ EAPI void *ecore_dlist_first_goto(Ecore_DList * _e_dlist);
+ EAPI void *ecore_dlist_last_goto(Ecore_DList * _e_dlist);
+ EAPI void *ecore_dlist_index_goto(Ecore_DList * _e_dlist, int index);
EAPI void *ecore_dlist_goto(Ecore_DList * _e_dlist, void *_data);
/* Traversing the list and returning data */
@@ -207,7 +239,7 @@
ecore_list_heapsort(list, compare, order)
/* Check to see if there is any data in the list */
- EAPI int ecore_dlist_is_empty(Ecore_DList * _e_dlist);
+ EAPI int ecore_dlist_empty_is(Ecore_DList * _e_dlist);
/* Remove every node in the list without free'ing it */
EAPI int ecore_dlist_clear(Ecore_DList * _e_dlist);
@@ -219,7 +251,7 @@
/* Destroying nodes */
EAPI int ecore_dlist_node_destroy(Ecore_DList_Node * node, Ecore_Free_Cb
free_func);
- EAPI int ecore_dlist_set_free_cb(Ecore_DList * dlist, Ecore_Free_Cb
free_func);
+ EAPI int ecore_dlist_free_cb_set(Ecore_DList * dlist, Ecore_Free_Cb
free_func);
@@ -263,8 +295,8 @@
EAPI int ecore_hash_init(Ecore_Hash *hash, Ecore_Hash_Cb hash_func,
Ecore_Compare_Cb compare);
/* Functions related to freeing the data in the hash table */
- EAPI int ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function);
- EAPI int ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb
function);
+ EAPI int ecore_hash_free_key_cb_set(Ecore_Hash *hash, Ecore_Free_Cb
function);
+ EAPI int ecore_hash_free_value_cb_set(Ecore_Hash *hash, Ecore_Free_Cb
function);
EAPI void ecore_hash_destroy(Ecore_Hash *hash);
EAPI int ecore_hash_count(Ecore_Hash *hash);
@@ -275,7 +307,7 @@
/* Retrieve and store data into the hash */
EAPI void *ecore_hash_get(Ecore_Hash *hash, const void *key);
EAPI int ecore_hash_set(Ecore_Hash *hash, void *key, void *value);
- EAPI int ecore_hash_set_hash(Ecore_Hash *hash, Ecore_Hash *set);
+ EAPI int ecore_hash_hash_set(Ecore_Hash *hash, Ecore_Hash *set);
EAPI void *ecore_hash_remove(Ecore_Hash *hash, const void *key);
EAPI void *ecore_hash_find(Ecore_Hash *hash, Ecore_Compare_Cb compare,
const void *value);
EAPI void ecore_hash_dump_graph(Ecore_Hash *hash);
@@ -344,7 +376,7 @@
*/
EAPI void *ecore_plugin_call(Ecore_Plugin * plugin, const char
*symbol_name);
- EAPI Ecore_List *ecore_plugin_get_available(int group_id);
+ EAPI Ecore_List *ecore_plugin_available_get(int group_id);
typedef struct _ecore_heap Ecore_Sheap;
@@ -367,13 +399,13 @@
EAPI Ecore_Sheap *ecore_sheap_new(Ecore_Compare_Cb compare, int size);
EAPI void ecore_sheap_destroy(Ecore_Sheap *heap);
EAPI int ecore_sheap_init(Ecore_Sheap *heap, Ecore_Compare_Cb compare, int
size);
- EAPI int ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb
free_func);
+ EAPI int ecore_sheap_free_cb_set(Ecore_Sheap *heap, Ecore_Free_Cb
free_func);
EAPI int ecore_sheap_insert(Ecore_Sheap *heap, void *data);
EAPI void *ecore_sheap_extract(Ecore_Sheap *heap);
EAPI void *ecore_sheap_extreme(Ecore_Sheap *heap);
EAPI int ecore_sheap_change(Ecore_Sheap *heap, void *item, void *newval);
- EAPI int ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb
compare);
- EAPI void ecore_sheap_set_order(Ecore_Sheap *heap, char order);
+ EAPI int ecore_sheap_compare_set(Ecore_Sheap *heap, Ecore_Compare_Cb
compare);
+ EAPI void ecore_sheap_order_set(Ecore_Sheap *heap, char order);
EAPI void ecore_sheap_sort(Ecore_Sheap *heap);
EAPI void *ecore_sheap_item(Ecore_Sheap *heap, int i);
@@ -435,15 +467,15 @@
/* Free the tree */
EAPI int ecore_tree_destroy(Ecore_Tree * tree);
/* Check to see if the tree has any nodes in it */
- EAPI int ecore_tree_is_empty(Ecore_Tree * tree);
+ EAPI int ecore_tree_empty_is(Ecore_Tree * tree);
/* Retrieve the value associated with key */
EAPI void *ecore_tree_get(Ecore_Tree * tree, const void *key);
EAPI Ecore_Tree_Node *ecore_tree_get_node(Ecore_Tree * tree, const void
*key);
/* Retrieve the value of node with key greater than or equal to key */
- EAPI void *ecore_tree_get_closest_larger(Ecore_Tree * tree, const void
*key);
+ EAPI void *ecore_tree_closest_larger_get(Ecore_Tree * tree, const void
*key);
/* Retrieve the value of node with key less than or equal to key */
- EAPI void *ecore_tree_get_closest_smaller(Ecore_Tree * tree, const void
*key);
+ EAPI void *ecore_tree_closest_smaller_get(Ecore_Tree * tree, const void
*key);
/* Set the value associated with key to value */
EAPI int ecore_tree_set(Ecore_Tree * tree, void *key, void *value);
@@ -451,9 +483,9 @@
EAPI int ecore_tree_remove(Ecore_Tree * tree, const void *key);
/* Add a node to the tree */
- EAPI int ecore_tree_add_node(Ecore_Tree * tree, Ecore_Tree_Node * node);
+ EAPI int ecore_tree_node_add(Ecore_Tree * tree, Ecore_Tree_Node * node);
/* Remove a node from the tree */
- EAPI int ecore_tree_remove_node(Ecore_Tree * tree, Ecore_Tree_Node * node);
+ EAPI int ecore_tree_node_remove(Ecore_Tree * tree, Ecore_Tree_Node * node);
/* For each node in the tree perform the for_each_func function */
/* For this one pass in the node */
@@ -484,9 +516,9 @@
EAPI void *ecore_tree_node_value_get(Ecore_Tree_Node * node);
/* Add a function to free the data stored in nodes */
- EAPI int ecore_tree_set_free_value(Ecore_Tree * tree, Ecore_Free_Cb
free_value);
+ EAPI int ecore_tree_free_value_cb_set(Ecore_Tree * tree, Ecore_Free_Cb
free_value);
/* Add a function to free the keys stored in nodes */
- EAPI int ecore_tree_set_free_key(Ecore_Tree * tree, Ecore_Free_Cb free_key);
+ EAPI int ecore_tree_free_key_cb_set(Ecore_Tree * tree, Ecore_Free_Cb
free_key);
EAPI Ecore_Strbuf * ecore_strbuf_new(void);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_hash.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ecore_hash.c 3 Jun 2007 12:22:05 -0000 1.39
+++ ecore_hash.c 25 Jul 2007 17:00:54 -0000 1.40
@@ -101,7 +101,7 @@
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/
EAPI int
-ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function)
+ecore_hash_free_key_cb_set(Ecore_Hash *hash, Ecore_Free_Cb function)
{
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
@@ -119,7 +119,7 @@
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/
EAPI int
-ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb function)
+ecore_hash_free_value_cb_set(Ecore_Hash *hash, Ecore_Free_Cb function)
{
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
@@ -177,7 +177,7 @@
* @ingroup Ecore_Data_Hash_ADT_Data_Group
*/
EAPI int
-ecore_hash_set_hash(Ecore_Hash *hash, Ecore_Hash *set)
+ecore_hash_hash_set(Ecore_Hash *hash, Ecore_Hash *set)
{
unsigned int i;
Ecore_Hash_Node *node, *old;
@@ -334,7 +334,7 @@
}
i++;
}
- ecore_list_goto_first(keys);
+ ecore_list_first_goto(keys);
return keys;
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_list.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ecore_list.c 25 Jul 2007 09:04:28 -0000 1.40
+++ ecore_list.c 25 Jul 2007 17:00:54 -0000 1.41
@@ -17,15 +17,15 @@
/* Remove functions */
static void *_ecore_list_remove_0(Ecore_List * list);
-static void *_ecore_list_remove_first(Ecore_List * list);
-static void *_ecore_list_remove_last(Ecore_List * list);
+static void *_ecore_list_first_remove(Ecore_List * list);
+static void *_ecore_list_last_remove(Ecore_List * list);
/* Basic traversal functions */
static void *_ecore_list_next(Ecore_List * list);
-static void *_ecore_list_goto_last(Ecore_List * list);
-static void *_ecore_list_goto_first(Ecore_List * list);
+static void *_ecore_list_last_goto(Ecore_List * list);
+static void *_ecore_list_first_goto(Ecore_List * list);
static void *_ecore_list_goto(Ecore_List * list, const void *data);
-static void *_ecore_list_goto_index(Ecore_List *list, int index);
+static void *_ecore_list_index_goto(Ecore_List *list, int index);
/* Iterative functions */
static int _ecore_list_for_each(Ecore_List *list, Ecore_For_Each function,
@@ -49,8 +49,8 @@
/* Private double linked list functions */
static void *_ecore_dlist_previous(Ecore_DList * list);
-static void *_ecore_dlist_remove_first(Ecore_DList *list);
-static void *_ecore_dlist_goto_index(Ecore_DList *list, int index);
+static void *_ecore_dlist_first_remove(Ecore_DList *list);
+static void *_ecore_dlist_index_goto(Ecore_DList *list, int index);
/* XXX: Begin deprecated code */
EAPI void *
@@ -283,7 +283,7 @@
while (list->first)
{
- data = _ecore_list_remove_first(list);
+ data = _ecore_list_first_remove(list);
if (list->free_func)
list->free_func(data);
}
@@ -299,7 +299,7 @@
* @return @c TRUE on successful set, @c FALSE otherwise.
*/
EAPI int
-ecore_list_set_free_cb(Ecore_List *list, Ecore_Free_Cb free_func)
+ecore_list_free_cb_set(Ecore_List *list, Ecore_Free_Cb free_func)
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
@@ -314,7 +314,7 @@
* @return @c TRUE if no nodes in list, @c FALSE if the list contains nodes
*/
EAPI int
-ecore_list_is_empty(Ecore_List *list)
+ecore_list_empty_is(Ecore_List *list)
{
int ret = TRUE;
@@ -349,7 +349,7 @@
* @return The number of nodes in the list.
*/
EAPI int
-ecore_list_nodes(Ecore_List *list)
+ecore_list_count(Ecore_List *list)
{
int ret = 0;
@@ -503,7 +503,7 @@
new_node->next = list->current;
/* And hook the node into the list */
- _ecore_list_goto_index(list, ecore_list_index(list) - 1);
+ _ecore_list_index_goto(list, ecore_list_index(list) - 1);
list->current->next = new_node;
@@ -527,9 +527,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
CHECK_PARAM_POINTER_RETURN("append", append, FALSE);
- if (ecore_list_is_empty(append)) return TRUE;
+ if (ecore_list_empty_is(append)) return TRUE;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
{
list->first = append->first;
list->current = NULL;
@@ -559,9 +559,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
CHECK_PARAM_POINTER_RETURN("prepend", prepend, FALSE);
- if (ecore_list_is_empty(prepend)) return TRUE;
+ if (ecore_list_empty_is(prepend)) return TRUE;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
{
list->first = prepend->first;
list->current = NULL;
@@ -613,21 +613,21 @@
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
if (!list->current)
return NULL;
if (list->current == list->first)
- return _ecore_list_remove_first(list);
+ return _ecore_list_first_remove(list);
if (list->current == list->last)
- return _ecore_list_remove_last(list);
+ return _ecore_list_last_remove(list);
old = list->current;
- _ecore_list_goto_index(list, list->index - 1);
+ _ecore_list_index_goto(list, list->index - 1);
list->current->next = old->next;
old->next = NULL;
@@ -670,20 +670,20 @@
* @ingroup Ecore_Data_List_Remove_Item_Group
*/
EAPI inline void *
-ecore_list_remove_first(Ecore_List *list)
+ecore_list_first_remove(Ecore_List *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_remove_first(list);
+ ret = _ecore_list_first_remove(list);
return ret;
}
/* Remove the first item from the list */
static void *
-_ecore_list_remove_first(Ecore_List *list)
+_ecore_list_first_remove(Ecore_List *list)
{
void *ret = NULL;
Ecore_List_Node *old;
@@ -691,7 +691,7 @@
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
old = list->first;
@@ -722,20 +722,20 @@
* @ingroup Ecore_Data_List_Remove_Item_Group
*/
EAPI inline void *
-ecore_list_remove_last(Ecore_List *list)
+ecore_list_last_remove(Ecore_List *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_remove_last(list);
+ ret = _ecore_list_last_remove(list);
return ret;
}
/* Remove the last item from the list */
static void *
-_ecore_list_remove_last(Ecore_List *list)
+_ecore_list_last_remove(Ecore_List *list)
{
void *ret = NULL;
Ecore_List_Node *old, *prev;
@@ -743,7 +743,7 @@
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
old = list->last;
@@ -781,13 +781,13 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI inline void *
-ecore_list_goto_index(Ecore_List *list, int index)
+ecore_list_index_goto(Ecore_List *list, int index)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_index(list, index);
+ ret = _ecore_list_index_goto(list, index);
return ret;
}
@@ -795,22 +795,22 @@
/* This is the non-threadsafe version, use this inside internal functions that
* already lock the list */
static void *
-_ecore_list_goto_index(Ecore_List *list, int index)
+_ecore_list_index_goto(Ecore_List *list, int index)
{
int i;
if (!list)
return NULL;
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
- if (index > ecore_list_nodes(list) || index < 0)
+ if (index > ecore_list_count(list) || index < 0)
return NULL;
if (index < list->index)
{
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
i = 0;
}
else
@@ -888,20 +888,20 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI inline void *
-ecore_list_goto_first(Ecore_List *list)
+ecore_list_first_goto(Ecore_List *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_first(list);
+ ret = _ecore_list_first_goto(list);
return ret;
}
/* Set the current position to the start of the list */
static void *
-_ecore_list_goto_first(Ecore_List *list)
+_ecore_list_first_goto(Ecore_List *list)
{
if (!list || !list->first)
return NULL;
@@ -919,20 +919,20 @@
* @ingroup Ecore_Data_List_Traverse_Group
*/
EAPI inline void *
-ecore_list_goto_last(Ecore_List *list)
+ecore_list_last_goto(Ecore_List *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_last(list);
+ ret = _ecore_list_last_goto(list);
return ret;
}
/* Set the current position to the end of the list */
static void *
-_ecore_list_goto_last(Ecore_List *list)
+_ecore_list_last_goto(Ecore_List *list)
{
if (!list || !list->last)
return NULL;
@@ -1058,8 +1058,8 @@
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- while (!ecore_list_is_empty(list))
- _ecore_list_remove_first(list);
+ while (!ecore_list_empty_is(list))
+ _ecore_list_first_remove(list);
return TRUE;
}
@@ -1092,7 +1092,7 @@
if (!list || !function)
return FALSE;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
while ((value = _ecore_list_next(list)) != NULL)
function(value, user_data);
@@ -1121,7 +1121,7 @@
void *value;
if (!list || !function) return NULL;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
while ((value = _ecore_list_current(list)) != NULL)
{
if (!function(value, user_data)) return value;
@@ -1190,7 +1190,7 @@
node = node->next;
list->last = node;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
return 1;
}
@@ -1310,8 +1310,8 @@
if (!heap)
return 0;
- ecore_sheap_set_order(heap, order);
- _ecore_list_goto_first(list);
+ ecore_sheap_order_set(heap, order);
+ _ecore_list_first_goto(list);
while ((data = _ecore_list_next(list)))
{
ecore_sheap_insert(heap, data);
@@ -1329,7 +1329,7 @@
ecore_sheap_destroy(heap);
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
return 1;
}
@@ -1452,7 +1452,7 @@
while (list->first)
{
- data = _ecore_dlist_remove_first(list);
+ data = _ecore_dlist_first_remove(list);
if (list->free_func)
list->free_func(data);
}
@@ -1469,11 +1469,11 @@
* @ingroup Ecore_Data_DList_Creation_Group
*/
EAPI int
-ecore_dlist_set_free_cb(Ecore_DList *list, Ecore_Free_Cb free_func)
+ecore_dlist_free_cb_set(Ecore_DList *list, Ecore_Free_Cb free_func)
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- return ecore_list_set_free_cb(ECORE_LIST(list), free_func);
+ return ecore_list_free_cb_set(ECORE_LIST(list), free_func);
}
/**
@@ -1482,11 +1482,11 @@
* @return @c TRUE if there are nodes, @c FALSE otherwise.
*/
EAPI int
-ecore_dlist_is_empty(Ecore_DList *list)
+ecore_dlist_empty_is(Ecore_DList *list)
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- return ecore_list_is_empty(ECORE_LIST(list));
+ return ecore_list_empty_is(ECORE_LIST(list));
}
/**
@@ -1618,9 +1618,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
CHECK_PARAM_POINTER_RETURN("append", append, FALSE);
- if (ecore_dlist_is_empty(append)) return TRUE;
+ if (ecore_dlist_empty_is(append)) return TRUE;
- if (ecore_dlist_is_empty(list))
+ if (ecore_dlist_empty_is(list))
{
list->first = append->first;
list->current = NULL;
@@ -1651,9 +1651,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
CHECK_PARAM_POINTER_RETURN("prepend", prepend, FALSE);
- if (ecore_dlist_is_empty(prepend)) return TRUE;
+ if (ecore_dlist_empty_is(prepend)) return TRUE;
- if (ecore_dlist_is_empty(list))
+ if (ecore_dlist_empty_is(list))
{
list->first = prepend->first;
list->current = NULL;
@@ -1711,13 +1711,13 @@
* @ingroup Ecore_Data_DList_Remove_Item_Group
*/
EAPI void *
-ecore_dlist_remove_first(Ecore_DList *list)
+ecore_dlist_first_remove(Ecore_DList *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_dlist_remove_first(list);
+ ret = _ecore_dlist_first_remove(list);
return ret;
}
@@ -1747,14 +1747,14 @@
}
static void *
-_ecore_dlist_remove_first(Ecore_DList *list)
+_ecore_dlist_first_remove(Ecore_DList *list)
{
void *ret;
if (!list)
return NULL;
- ret = _ecore_list_remove_first(list);
+ ret = _ecore_list_first_remove(list);
if (ret && ECORE_LIST(list)->first)
ECORE_DLIST_NODE(ECORE_LIST(list)->first)->previous = NULL;
@@ -1768,14 +1768,14 @@
* @ingroup Ecore_Data_DList_Remove_Item_Group
*/
EAPI void *
-ecore_dlist_remove_last(Ecore_DList *list)
+ecore_dlist_last_remove(Ecore_DList *list)
{
void *ret;
Ecore_List_Node *node;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- if (ecore_list_is_empty(list))
+ if (ecore_list_empty_is(list))
return NULL;
node = list->last;
@@ -1804,13 +1804,13 @@
* @return The node at specified index on success, @c NULL on error.
*/
EAPI void *
-ecore_dlist_goto_index(Ecore_DList *list, int index)
+ecore_dlist_index_goto(Ecore_DList *list, int index)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_dlist_goto_index(list, index);
+ ret = _ecore_dlist_index_goto(list, index);
return ret;
}
@@ -1818,21 +1818,21 @@
/* This is the non-threadsafe version, use this inside internal functions that
* already lock the list */
static void *
-_ecore_dlist_goto_index(Ecore_DList *list, int index)
+_ecore_dlist_index_goto(Ecore_DList *list, int index)
{
int i, increment;
if (!list)
return NULL;
- if (ecore_list_is_empty(ECORE_LIST(list)))
+ if (ecore_list_empty_is(ECORE_LIST(list)))
return NULL;
- if (index > ecore_list_nodes(ECORE_LIST(list)) || index < 0)
+ if (index > ecore_list_count(ECORE_LIST(list)) || index < 0)
return NULL;
if (ECORE_LIST(list)->index >= ECORE_LIST(list)->nodes)
- _ecore_list_goto_last(ECORE_LIST(list));
+ _ecore_list_last_goto(ECORE_LIST(list));
if (index < ECORE_LIST(list)->index)
increment = -1;
@@ -1876,13 +1876,13 @@
* @return Returns a pointer to the first item on success, NULL on failure.
*/
EAPI void *
-ecore_dlist_goto_first(Ecore_DList *list)
+ecore_dlist_first_goto(Ecore_DList *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_first(list);
+ ret = _ecore_list_first_goto(list);
return ret;
}
@@ -1893,13 +1893,13 @@
* @return Returns a pointer to the last item in the list , NULL if empty.
*/
EAPI void *
-ecore_dlist_goto_last(Ecore_DList *list)
+ecore_dlist_last_goto(Ecore_DList *list)
{
void *ret;
CHECK_PARAM_POINTER_RETURN("list", list, NULL);
- ret = _ecore_list_goto_last(ECORE_LIST(list));
+ ret = _ecore_list_last_goto(ECORE_LIST(list));
return ret;
}
@@ -1965,7 +1965,7 @@
ECORE_LIST(list)->index--;
}
else
- _ecore_list_goto_last(ECORE_LIST(list));
+ _ecore_list_last_goto(ECORE_LIST(list));
return data;
}
@@ -2045,7 +2045,7 @@
node = node->next;
list->last = node;
- _ecore_list_goto_first(list);
+ _ecore_list_first_goto(list);
return 1;
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_path.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_path.c 8 Mar 2007 00:17:22 -0000 1.12
+++ ecore_path.c 25 Jul 2007 17:00:54 -0000 1.13
@@ -43,7 +43,7 @@
group->name = strdup(group_name);
ecore_list_append(group_list, group);
- last = ecore_list_goto_last(group_list);
+ last = ecore_list_last_goto(group_list);
group->id = last->id + 1;
return group->id;
@@ -73,7 +73,7 @@
if (ecore_list_goto(group_list, group))
ecore_list_remove(group_list);
- if (ecore_list_is_empty(group_list))
+ if (ecore_list_empty_is(group_list))
{
ecore_list_destroy(group_list);
group_list = NULL;
@@ -129,7 +129,7 @@
/*
* Find the path in the list of available paths
*/
- ecore_list_goto_first(group->paths);
+ ecore_list_first_goto(group->paths);
while ((found = ecore_list_current(group->paths)) && strcmp(found, path))
ecore_list_next(group->paths);
@@ -168,7 +168,7 @@
/*
* Search the paths of the path group for the specified file name
*/
- ecore_list_goto_first(group->paths);
+ ecore_list_first_goto(group->paths);
p = ecore_list_next(group->paths);
do
{
@@ -200,10 +200,10 @@
group = __ecore_path_group_find_id(group_id);
- if (!group || !group->paths || ecore_list_is_empty(group->paths))
+ if (!group || !group->paths || ecore_list_empty_is(group->paths))
return NULL;
- ecore_list_goto_first(group->paths);
+ ecore_list_first_goto(group->paths);
while ((path = ecore_list_next(group->paths)) != NULL)
{
@@ -268,7 +268,7 @@
CHECK_PARAM_POINTER_RETURN("name", name, NULL);
- ecore_list_goto_first(group_list);
+ ecore_list_first_goto(group_list);
while ((group = ecore_list_next(group_list)) != NULL)
if (!strcmp(group->name, name))
@@ -285,7 +285,7 @@
{
Ecore_Path_Group *group;
- ecore_list_goto_first(group_list);
+ ecore_list_first_goto(group_list);
while ((group = ecore_list_next(group_list)) != NULL)
if (group->id == id)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_plugin.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_plugin.c 8 Mar 2007 00:20:06 -0000 1.11
+++ ecore_plugin.c 25 Jul 2007 17:00:54 -0000 1.12
@@ -83,7 +83,7 @@
if (ecore_list_goto(loaded_plugins, plugin))
ecore_list_remove(loaded_plugins);
- if (ecore_list_is_empty(loaded_plugins))
+ if (ecore_list_empty_is(loaded_plugins))
{
ecore_list_destroy(loaded_plugins);
loaded_plugins = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_sheap.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_sheap.c 1 Feb 2007 19:22:35 -0000 1.12
+++ ecore_sheap.c 25 Jul 2007 17:00:54 -0000 1.13
@@ -99,7 +99,7 @@
* @return @c TRUE on successful set, @c FALSE otherwise.
*/
EAPI int
-ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb free_func)
+ecore_sheap_free_cb_set(Ecore_Sheap *heap, Ecore_Free_Cb free_func)
{
CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
@@ -283,7 +283,7 @@
* by the new comparison.
*/
EAPI int
-ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb compare)
+ecore_sheap_compare_set(Ecore_Sheap *heap, Ecore_Compare_Cb compare)
{
CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
@@ -306,7 +306,7 @@
* order. The default order is a min heap.
*/
EAPI void
-ecore_sheap_set_order(Ecore_Sheap *heap, char order)
+ecore_sheap_order_set(Ecore_Sheap *heap, char order)
{
CHECK_PARAM_POINTER("heap", heap);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_strings.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_strings.c 27 Jun 2007 10:57:54 -0000 1.16
+++ ecore_strings.c 25 Jul 2007 17:00:54 -0000 1.17
@@ -29,7 +29,7 @@
ecore_strings = ecore_hash_new(ecore_str_hash, ecore_str_compare);
if (!ecore_strings)
return 0;
- ecore_hash_set_free_value(ecore_strings, ecore_string_free_cb);
+ ecore_hash_free_value_cb_set(ecore_strings, ecore_string_free_cb);
}
ecore_string_init_count++;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_tree.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_tree.c 4 Jun 2007 15:28:29 -0000 1.12
+++ ecore_tree.c 25 Jul 2007 17:00:54 -0000 1.13
@@ -73,7 +73,7 @@
* @return Returns TRUE on successful set, FALSE otherwise.
*/
EAPI int
-ecore_tree_set_free_value(Ecore_Tree *tree, Ecore_Free_Cb free_value)
+ecore_tree_free_value_cb_set(Ecore_Tree *tree, Ecore_Free_Cb free_value)
{
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
@@ -89,7 +89,7 @@
* @return Returns TRUE on successful set, FALSE otherwise.
*/
EAPI int
-ecore_tree_set_free_key(Ecore_Tree *tree, Ecore_Free_Cb free_key)
+ecore_tree_free_key_cb_set(Ecore_Tree *tree, Ecore_Free_Cb free_key)
{
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
@@ -244,7 +244,7 @@
while ((node = tree->tree))
{
- ecore_tree_remove_node(tree, node);
+ ecore_tree_node_remove(tree, node);
ecore_tree_node_destroy(node, tree->free_value, tree->free_key);
}
@@ -300,7 +300,7 @@
* equal to the key
*/
EAPI void *
-ecore_tree_get_closest_larger(Ecore_Tree *tree, const void *key)
+ecore_tree_closest_larger_get(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *node;
@@ -327,7 +327,7 @@
* @return Returns NULL if no valid nodes, otherwise the node <= key
*/
EAPI void *
-ecore_tree_get_closest_smaller(Ecore_Tree *tree, const void *key)
+ecore_tree_closest_smaller_get(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *node;
@@ -363,7 +363,7 @@
{
node = ecore_tree_node_new();
ecore_tree_node_key_set(node, key);
- if (!ecore_tree_add_node(tree, node))
+ if (!ecore_tree_node_add(tree, node))
return FALSE;
}
else
@@ -389,7 +389,7 @@
* @return TRUE on a successful add, FALSE otherwise.
*/
EAPI int
-ecore_tree_add_node(Ecore_Tree *tree, Ecore_Tree_Node *node)
+ecore_tree_node_add(Ecore_Tree *tree, Ecore_Tree_Node *node)
{
Ecore_Tree_Node *travel = NULL;
@@ -428,7 +428,7 @@
* @return TRUE on a successful remove, FALSE otherwise.
*/
EAPI int
-ecore_tree_remove_node(Ecore_Tree *tree, Ecore_Tree_Node *node)
+ecore_tree_node_remove(Ecore_Tree *tree, Ecore_Tree_Node *node)
{
Ecore_Tree_Node *traverse;
@@ -560,7 +560,7 @@
if (!node)
return FALSE;
- if (!ecore_tree_remove_node(tree, node))
+ if (!ecore_tree_node_remove(tree, node))
return FALSE;
ecore_tree_node_destroy(node, tree->free_value, tree->free_key);
@@ -574,7 +574,7 @@
* @return Returns TRUE if no nodes exist, FALSE otherwise
*/
EAPI int
-ecore_tree_is_empty(Ecore_Tree *tree)
+ecore_tree_empty_is(Ecore_Tree *tree)
{
CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
