2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
parameter of g_tree_lookup and g_tree_remove and the 'data'
parameter of g_tree_serach. This function now takes a function of
type GCompareFunc instead of GSearchFunc.
* glib.h: Removed declaration of GSearchFunc.
* gmem.c: s/GSearchFunc/GCompareFunc/.
16 files changed:
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
+2000-04-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * glib.h, gcache.c, gtree.c: Changed the 'value' parameter of
+ g_cache_remove from gpointer to gconstpointer. Dito for the 'key'
+ parameter of g_tree_lookup and g_tree_remove and the 'data'
+ parameter of g_tree_serach. This function now takes a function of
+ type GCompareFunc instead of GSearchFunc.
+
+ * glib.h: Removed declaration of GSearchFunc.
+
+ * gmem.c: s/GSearchFunc/GCompareFunc/.
+
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Tor Lillqvist <tml@iki.fi>
* glib.def: Update entry point list.
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
2000-04-19 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h (G_TRYLOCK): Made the debugging G_TRYLOCK call also work
- for compilers with funnt G_STMT_(START|END) macros.
+ for compilers with funny G_STMT_(START|END) macros.
* tests/thread-test.c: Implemented a check for that.
* tests/thread-test.c: Implemented a check for that.
-g_cache_remove (GCache *cache,
- gpointer value)
+g_cache_remove (GCache *cache,
+ gconstpointer value)
{
GRealCache *rcache;
GCacheNode *node;
{
GRealCache *rcache;
GCacheNode *node;
gpointer data);
typedef void (*GNodeForeachFunc) (GNode *node,
gpointer data);
gpointer data);
typedef void (*GNodeForeachFunc) (GNode *node,
gpointer data);
-typedef gint (*GSearchFunc) (gpointer key,
- gpointer data);
typedef void (*GScannerMsgFunc) (GScanner *scanner,
gchar *message,
gint error);
typedef void (*GScannerMsgFunc) (GScanner *scanner,
gchar *message,
gint error);
gpointer g_cache_insert (GCache *cache,
gpointer key);
void g_cache_remove (GCache *cache,
gpointer g_cache_insert (GCache *cache,
gpointer key);
void g_cache_remove (GCache *cache,
void g_cache_key_foreach (GCache *cache,
GHFunc func,
gpointer user_data);
void g_cache_key_foreach (GCache *cache,
GHFunc func,
gpointer user_data);
gpointer key,
gpointer value);
void g_tree_remove (GTree *tree,
gpointer key,
gpointer value);
void g_tree_remove (GTree *tree,
gpointer g_tree_lookup (GTree *tree,
gpointer g_tree_lookup (GTree *tree,
void g_tree_traverse (GTree *tree,
GTraverseFunc traverse_func,
GTraverseType traverse_type,
gpointer data);
gpointer g_tree_search (GTree *tree,
void g_tree_traverse (GTree *tree,
GTraverseFunc traverse_func,
GTraverseType traverse_type,
gpointer data);
gpointer g_tree_search (GTree *tree,
- GSearchFunc search_func,
- gpointer data);
+ GCompareFunc search_func,
+ gconstpointer data);
gint g_tree_height (GTree *tree);
gint g_tree_nnodes (GTree *tree);
gint g_tree_height (GTree *tree);
gint g_tree_nnodes (GTree *tree);
-g_cache_remove (GCache *cache,
- gpointer value)
+g_cache_remove (GCache *cache,
+ gconstpointer value)
{
GRealCache *rcache;
GCacheNode *node;
{
GRealCache *rcache;
GCacheNode *node;
gpointer data);
typedef void (*GNodeForeachFunc) (GNode *node,
gpointer data);
gpointer data);
typedef void (*GNodeForeachFunc) (GNode *node,
gpointer data);
-typedef gint (*GSearchFunc) (gpointer key,
- gpointer data);
typedef void (*GScannerMsgFunc) (GScanner *scanner,
gchar *message,
gint error);
typedef void (*GScannerMsgFunc) (GScanner *scanner,
gchar *message,
gint error);
gpointer g_cache_insert (GCache *cache,
gpointer key);
void g_cache_remove (GCache *cache,
gpointer g_cache_insert (GCache *cache,
gpointer key);
void g_cache_remove (GCache *cache,
void g_cache_key_foreach (GCache *cache,
GHFunc func,
gpointer user_data);
void g_cache_key_foreach (GCache *cache,
GHFunc func,
gpointer user_data);
gpointer key,
gpointer value);
void g_tree_remove (GTree *tree,
gpointer key,
gpointer value);
void g_tree_remove (GTree *tree,
gpointer g_tree_lookup (GTree *tree,
gpointer g_tree_lookup (GTree *tree,
void g_tree_traverse (GTree *tree,
GTraverseFunc traverse_func,
GTraverseType traverse_type,
gpointer data);
gpointer g_tree_search (GTree *tree,
void g_tree_traverse (GTree *tree,
GTraverseFunc traverse_func,
GTraverseType traverse_type,
gpointer data);
gpointer g_tree_search (GTree *tree,
- GSearchFunc search_func,
- gpointer data);
+ GCompareFunc search_func,
+ gconstpointer data);
gint g_tree_height (GTree *tree);
gint g_tree_nnodes (GTree *tree);
gint g_tree_height (GTree *tree);
gint g_tree_nnodes (GTree *tree);
/* Determine which area this piece of memory is allocated from */
temp_area = g_tree_search (rmem_chunk->mem_tree,
/* Determine which area this piece of memory is allocated from */
temp_area = g_tree_search (rmem_chunk->mem_tree,
- (GSearchFunc) g_mem_chunk_area_search,
+ (GCompareFunc) g_mem_chunk_area_search,
mem);
/* If the area has been marked, then it is being destroyed.
mem);
/* If the area has been marked, then it is being destroyed.
rmem_chunk->free_atoms = free_atom;
temp_area = g_tree_search (rmem_chunk->mem_tree,
rmem_chunk->free_atoms = free_atom;
temp_area = g_tree_search (rmem_chunk->mem_tree,
- (GSearchFunc) g_mem_chunk_area_search,
+ (GCompareFunc) g_mem_chunk_area_search,
mem);
temp_area->allocated -= 1;
mem);
temp_area->allocated -= 1;
mem = (gpointer) temp_free_atom;
mem_area = g_tree_search (rmem_chunk->mem_tree,
mem = (gpointer) temp_free_atom;
mem_area = g_tree_search (rmem_chunk->mem_tree,
- (GSearchFunc) g_mem_chunk_area_search,
+ (GCompareFunc) g_mem_chunk_area_search,
mem);
/* If this mem area is marked for destruction then delete the
mem);
/* If this mem area is marked for destruction then delete the
gint *inserted);
static GTreeNode* g_tree_node_remove (GTreeNode *node,
GCompareFunc compare,
gint *inserted);
static GTreeNode* g_tree_node_remove (GTreeNode *node,
GCompareFunc compare,
static GTreeNode* g_tree_node_balance (GTreeNode *node);
static GTreeNode* g_tree_node_remove_leftmost (GTreeNode *node,
GTreeNode **leftmost);
static GTreeNode* g_tree_node_balance (GTreeNode *node);
static GTreeNode* g_tree_node_remove_leftmost (GTreeNode *node,
GTreeNode **leftmost);
gint old_balance);
static gpointer g_tree_node_lookup (GTreeNode *node,
GCompareFunc compare,
gint old_balance);
static gpointer g_tree_node_lookup (GTreeNode *node,
GCompareFunc compare,
static gint g_tree_node_count (GTreeNode *node);
static gint g_tree_node_pre_order (GTreeNode *node,
GTraverseFunc traverse_func,
static gint g_tree_node_count (GTreeNode *node);
static gint g_tree_node_pre_order (GTreeNode *node,
GTraverseFunc traverse_func,
GTraverseFunc traverse_func,
gpointer data);
static gpointer g_tree_node_search (GTreeNode *node,
GTraverseFunc traverse_func,
gpointer data);
static gpointer g_tree_node_search (GTreeNode *node,
- GSearchFunc search_func,
- gpointer data);
+ GCompareFunc search_func,
+ gconstpointer data);
static gint g_tree_node_height (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_left (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_right (GTreeNode *node);
static gint g_tree_node_height (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_left (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_right (GTreeNode *node);
-g_tree_remove (GTree *tree,
- gpointer key)
+g_tree_remove (GTree *tree,
+ gconstpointer key)
-g_tree_lookup (GTree *tree,
- gpointer key)
+g_tree_lookup (GTree *tree,
+ gconstpointer key)
-g_tree_search (GTree *tree,
- GSearchFunc search_func,
- gpointer data)
+g_tree_search (GTree *tree,
+ GCompareFunc search_func,
+ gconstpointer data)
-g_tree_node_remove (GTreeNode *node,
- GCompareFunc compare,
- gpointer key)
+g_tree_node_remove (GTreeNode *node,
+ GCompareFunc compare,
+ gconstpointer key)
{
GTreeNode *new_root;
gint old_balance;
{
GTreeNode *new_root;
gint old_balance;
-g_tree_node_lookup (GTreeNode *node,
- GCompareFunc compare,
- gpointer key)
+g_tree_node_lookup (GTreeNode *node,
+ GCompareFunc compare,
+ gconstpointer key)
-g_tree_node_search (GTreeNode *node,
- GSearchFunc search_func,
- gpointer data)
+g_tree_node_search (GTreeNode *node,
+ GCompareFunc search_func,
+ gconstpointer data)
/* Determine which area this piece of memory is allocated from */
temp_area = g_tree_search (rmem_chunk->mem_tree,
/* Determine which area this piece of memory is allocated from */
temp_area = g_tree_search (rmem_chunk->mem_tree,
- (GSearchFunc) g_mem_chunk_area_search,
+ (GCompareFunc) g_mem_chunk_area_search,
mem);
/* If the area has been marked, then it is being destroyed.
mem);
/* If the area has been marked, then it is being destroyed.
rmem_chunk->free_atoms = free_atom;
temp_area = g_tree_search (rmem_chunk->mem_tree,
rmem_chunk->free_atoms = free_atom;
temp_area = g_tree_search (rmem_chunk->mem_tree,
- (GSearchFunc) g_mem_chunk_area_search,
+ (GCompareFunc) g_mem_chunk_area_search,
mem);
temp_area->allocated -= 1;
mem);
temp_area->allocated -= 1;
mem = (gpointer) temp_free_atom;
mem_area = g_tree_search (rmem_chunk->mem_tree,
mem = (gpointer) temp_free_atom;
mem_area = g_tree_search (rmem_chunk->mem_tree,
- (GSearchFunc) g_mem_chunk_area_search,
+ (GCompareFunc) g_mem_chunk_area_search,
mem);
/* If this mem area is marked for destruction then delete the
mem);
/* If this mem area is marked for destruction then delete the
gint *inserted);
static GTreeNode* g_tree_node_remove (GTreeNode *node,
GCompareFunc compare,
gint *inserted);
static GTreeNode* g_tree_node_remove (GTreeNode *node,
GCompareFunc compare,
static GTreeNode* g_tree_node_balance (GTreeNode *node);
static GTreeNode* g_tree_node_remove_leftmost (GTreeNode *node,
GTreeNode **leftmost);
static GTreeNode* g_tree_node_balance (GTreeNode *node);
static GTreeNode* g_tree_node_remove_leftmost (GTreeNode *node,
GTreeNode **leftmost);
gint old_balance);
static gpointer g_tree_node_lookup (GTreeNode *node,
GCompareFunc compare,
gint old_balance);
static gpointer g_tree_node_lookup (GTreeNode *node,
GCompareFunc compare,
static gint g_tree_node_count (GTreeNode *node);
static gint g_tree_node_pre_order (GTreeNode *node,
GTraverseFunc traverse_func,
static gint g_tree_node_count (GTreeNode *node);
static gint g_tree_node_pre_order (GTreeNode *node,
GTraverseFunc traverse_func,
GTraverseFunc traverse_func,
gpointer data);
static gpointer g_tree_node_search (GTreeNode *node,
GTraverseFunc traverse_func,
gpointer data);
static gpointer g_tree_node_search (GTreeNode *node,
- GSearchFunc search_func,
- gpointer data);
+ GCompareFunc search_func,
+ gconstpointer data);
static gint g_tree_node_height (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_left (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_right (GTreeNode *node);
static gint g_tree_node_height (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_left (GTreeNode *node);
static GTreeNode* g_tree_node_rotate_right (GTreeNode *node);
-g_tree_remove (GTree *tree,
- gpointer key)
+g_tree_remove (GTree *tree,
+ gconstpointer key)
-g_tree_lookup (GTree *tree,
- gpointer key)
+g_tree_lookup (GTree *tree,
+ gconstpointer key)
-g_tree_search (GTree *tree,
- GSearchFunc search_func,
- gpointer data)
+g_tree_search (GTree *tree,
+ GCompareFunc search_func,
+ gconstpointer data)
-g_tree_node_remove (GTreeNode *node,
- GCompareFunc compare,
- gpointer key)
+g_tree_node_remove (GTreeNode *node,
+ GCompareFunc compare,
+ gconstpointer key)
{
GTreeNode *new_root;
gint old_balance;
{
GTreeNode *new_root;
gint old_balance;
-g_tree_node_lookup (GTreeNode *node,
- GCompareFunc compare,
- gpointer key)
+g_tree_node_lookup (GTreeNode *node,
+ GCompareFunc compare,
+ gconstpointer key)
-g_tree_node_search (GTreeNode *node,
- GSearchFunc search_func,
- gpointer data)
+g_tree_node_search (GTreeNode *node,
+ GCompareFunc search_func,
+ gconstpointer data)