Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
Ecore_Data.h ecore_tree.c
Log Message:
use const void* for the keys in ecore_tree
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/Ecore_Data.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Ecore_Data.h 15 Apr 2007 17:20:59 -0000 1.42
+++ Ecore_Data.h 23 May 2007 15:20:55 -0000 1.43
@@ -398,7 +398,7 @@
struct _Ecore_Tree_Node {
/* The actual data for each node */
- void *key;
+ const void *key;
void *value;
/* Pointers to surrounding nodes */
@@ -436,17 +436,17 @@
EAPI int ecore_tree_is_empty(Ecore_Tree * tree);
/* Retrieve the value associated with key */
- EAPI void *ecore_tree_get(Ecore_Tree * tree, void *key);
- EAPI Ecore_Tree_Node *ecore_tree_get_node(Ecore_Tree * tree, void *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, void *key);
+ EAPI void *ecore_tree_get_closest_larger(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, void *key);
+ EAPI void *ecore_tree_get_closest_smaller(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);
+ EAPI int ecore_tree_set(Ecore_Tree * tree, const void *key, void *value);
/* Remove the key from the tree */
- EAPI int ecore_tree_remove(Ecore_Tree * tree, void *key);
+ 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);
@@ -471,9 +471,9 @@
EAPI int ecore_tree_node_destroy(Ecore_Tree_Node * node, Ecore_Free_Cb
free_data);
/* Set the node's key to key */
- EAPI int ecore_tree_node_key_set(Ecore_Tree_Node * node, void *key);
+ EAPI int ecore_tree_node_key_set(Ecore_Tree_Node * node, const void *key);
/* Retrieve the key in node */
- EAPI void *ecore_tree_node_key_get(Ecore_Tree_Node * node);
+ EAPI const void *ecore_tree_node_key_get(Ecore_Tree_Node * node);
/* Set the node's value to value */
EAPI int ecore_tree_node_value_set(Ecore_Tree_Node * node, void *value);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_tree.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_tree.c 23 Jun 2006 06:42:35 -0000 1.10
+++ ecore_tree.c 23 May 2007 15:20:55 -0000 1.11
@@ -7,8 +7,8 @@
/* Utility functions for searching the tree and returning a node, or its
* parent */
-static Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, void *key);
-static Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, void *key);
+static Ecore_Tree_Node *tree_node_find(Ecore_Tree * tree, const void *key);
+static Ecore_Tree_Node *tree_node_find_parent(Ecore_Tree * tree, const void
*key);
/* Balancing functions, keep the tree balanced within a one node height
* difference */
@@ -185,7 +185,7 @@
* @return Returns TRUE if the node is set successfully, FALSE if not.
*/
EAPI int
-ecore_tree_node_key_set(Ecore_Tree_Node *node, void *key)
+ecore_tree_node_key_set(Ecore_Tree_Node *node, const void *key)
{
CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
@@ -200,10 +200,10 @@
*
* @return Returns NULL if an error occurs, otherwise the key is returned
*/
-EAPI void *
+EAPI const void *
ecore_tree_node_key_get(Ecore_Tree_Node *node)
{
- void *ret;
+ const void *ret;
CHECK_PARAM_POINTER_RETURN("node", node, NULL);
ret = node->key;
@@ -243,7 +243,7 @@
* @return Returns the node corresponding to the key if found, otherwise NULL.
*/
EAPI Ecore_Tree_Node *
-ecore_tree_get_node(Ecore_Tree *tree, void *key)
+ecore_tree_get_node(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *ret;
@@ -261,7 +261,7 @@
* @return Returns the value corresponding to the key if found, otherwise NULL.
*/
EAPI void *
-ecore_tree_get(Ecore_Tree *tree, void *key)
+ecore_tree_get(Ecore_Tree *tree, const void *key)
{
void *ret;
Ecore_Tree_Node *node;
@@ -282,7 +282,7 @@
* equal to the key
*/
EAPI void *
-ecore_tree_get_closest_larger(Ecore_Tree *tree, void *key)
+ecore_tree_get_closest_larger(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *node;
@@ -309,7 +309,7 @@
* @return Returns NULL if no valid nodes, otherwise the node <= key
*/
EAPI void *
-ecore_tree_get_closest_smaller(Ecore_Tree *tree, void *key)
+ecore_tree_get_closest_smaller(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *node;
@@ -334,7 +334,7 @@
* @return TRUE if successful, FALSE if not.
*/
EAPI int
-ecore_tree_set(Ecore_Tree *tree, void *key, void *value)
+ecore_tree_set(Ecore_Tree *tree, const void *key, void *value)
{
Ecore_Tree_Node *node = NULL;
@@ -521,7 +521,7 @@
* @return TRUE on a successful remove, FALSE otherwise.
*/
EAPI int
-ecore_tree_remove(Ecore_Tree *tree, void *key)
+ecore_tree_remove(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *node;
@@ -598,7 +598,7 @@
/* Find the parent for the key */
static Ecore_Tree_Node *
-tree_node_find_parent(Ecore_Tree *tree, void *key)
+tree_node_find_parent(Ecore_Tree *tree, const void *key)
{
Ecore_Tree_Node *parent, *travel;
@@ -635,7 +635,7 @@
/* Search for the node with a specified key */
static Ecore_Tree_Node *
-tree_node_find(Ecore_Tree *tree, void *key)
+tree_node_find(Ecore_Tree *tree, const void *key)
{
int compare;
Ecore_Tree_Node *node;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
