mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-06-02 02:40:07 +02:00
Silence compiler warnings.
2005-11-28 Matthias Clasen <mclasen@redhat.com> * glib/gthread.c (g_static_rw_lock_wait, g_static_rw_lock_signal): * glib/gnode.c (g_node_depth_traverse_level): * glib/gmem.c (g_allocator_new): * glib/ghash.c (g_hash_table_unref, g_hash_table_destroy) (g_hash_table_foreach_remove_or_steal): Silence compiler warnings.
This commit is contained in:
parent
bb5ce4b2d3
commit
09b118f462
11
ChangeLog
11
ChangeLog
@ -1,3 +1,12 @@
|
|||||||
|
2005-11-28 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* glib/gthread.c (g_static_rw_lock_wait, g_static_rw_lock_signal):
|
||||||
|
* glib/gnode.c (g_node_depth_traverse_level):
|
||||||
|
* glib/gmem.c (g_allocator_new):
|
||||||
|
* glib/ghash.c (g_hash_table_unref, g_hash_table_destroy)
|
||||||
|
(g_hash_table_foreach_remove_or_steal): Silence compiler
|
||||||
|
warnings.
|
||||||
|
|
||||||
2005-11-27 Matthias Clasen <mclasen@redhat.com>
|
2005-11-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* glib/gunicollate.c (g_utf8_collate_key_for_filename):
|
* glib/gunicollate.c (g_utf8_collate_key_for_filename):
|
||||||
@ -6,7 +15,7 @@
|
|||||||
Wed Nov 23 17:34:01 2005 Tim Janik <timj@imendio.com>
|
Wed Nov 23 17:34:01 2005 Tim Janik <timj@imendio.com>
|
||||||
|
|
||||||
* glib/gdataset.c: access datalist flags via atomic pointer access
|
* glib/gdataset.c: access datalist flags via atomic pointer access
|
||||||
funcitons, instead of acquiring the dataset lock. this is faster and
|
functions, instead of acquiring the dataset lock. this is faster and
|
||||||
also matches the atomic pointer readouts in gdatalistprivate.h and
|
also matches the atomic pointer readouts in gdatalistprivate.h and
|
||||||
direct pointer modifications required by gobject.c.
|
direct pointer modifications required by gobject.c.
|
||||||
|
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
2005-11-28 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* glib/gthread.c (g_static_rw_lock_wait, g_static_rw_lock_signal):
|
||||||
|
* glib/gnode.c (g_node_depth_traverse_level):
|
||||||
|
* glib/gmem.c (g_allocator_new):
|
||||||
|
* glib/ghash.c (g_hash_table_unref, g_hash_table_destroy)
|
||||||
|
(g_hash_table_foreach_remove_or_steal): Silence compiler
|
||||||
|
warnings.
|
||||||
|
|
||||||
2005-11-27 Matthias Clasen <mclasen@redhat.com>
|
2005-11-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* glib/gunicollate.c (g_utf8_collate_key_for_filename):
|
* glib/gunicollate.c (g_utf8_collate_key_for_filename):
|
||||||
@ -6,7 +15,7 @@
|
|||||||
Wed Nov 23 17:34:01 2005 Tim Janik <timj@imendio.com>
|
Wed Nov 23 17:34:01 2005 Tim Janik <timj@imendio.com>
|
||||||
|
|
||||||
* glib/gdataset.c: access datalist flags via atomic pointer access
|
* glib/gdataset.c: access datalist flags via atomic pointer access
|
||||||
funcitons, instead of acquiring the dataset lock. this is faster and
|
functions, instead of acquiring the dataset lock. this is faster and
|
||||||
also matches the atomic pointer readouts in gdatalistprivate.h and
|
also matches the atomic pointer readouts in gdatalistprivate.h and
|
||||||
direct pointer modifications required by gobject.c.
|
direct pointer modifications required by gobject.c.
|
||||||
|
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
2005-11-28 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* glib/gthread.c (g_static_rw_lock_wait, g_static_rw_lock_signal):
|
||||||
|
* glib/gnode.c (g_node_depth_traverse_level):
|
||||||
|
* glib/gmem.c (g_allocator_new):
|
||||||
|
* glib/ghash.c (g_hash_table_unref, g_hash_table_destroy)
|
||||||
|
(g_hash_table_foreach_remove_or_steal): Silence compiler
|
||||||
|
warnings.
|
||||||
|
|
||||||
2005-11-27 Matthias Clasen <mclasen@redhat.com>
|
2005-11-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* glib/gunicollate.c (g_utf8_collate_key_for_filename):
|
* glib/gunicollate.c (g_utf8_collate_key_for_filename):
|
||||||
@ -6,7 +15,7 @@
|
|||||||
Wed Nov 23 17:34:01 2005 Tim Janik <timj@imendio.com>
|
Wed Nov 23 17:34:01 2005 Tim Janik <timj@imendio.com>
|
||||||
|
|
||||||
* glib/gdataset.c: access datalist flags via atomic pointer access
|
* glib/gdataset.c: access datalist flags via atomic pointer access
|
||||||
funcitons, instead of acquiring the dataset lock. this is faster and
|
functions, instead of acquiring the dataset lock. this is faster and
|
||||||
also matches the atomic pointer readouts in gdatalistprivate.h and
|
also matches the atomic pointer readouts in gdatalistprivate.h and
|
||||||
direct pointer modifications required by gobject.c.
|
direct pointer modifications required by gobject.c.
|
||||||
|
|
||||||
|
@ -190,7 +190,8 @@ g_hash_table_unref (GHashTable *hash_table)
|
|||||||
|
|
||||||
if (g_atomic_int_exchange_and_add (&hash_table->ref_count, -1) - 1 == 0)
|
if (g_atomic_int_exchange_and_add (&hash_table->ref_count, -1) - 1 == 0)
|
||||||
{
|
{
|
||||||
guint i;
|
gint i;
|
||||||
|
|
||||||
for (i = 0; i < hash_table->size; i++)
|
for (i = 0; i < hash_table->size; i++)
|
||||||
g_hash_nodes_destroy (hash_table->nodes[i],
|
g_hash_nodes_destroy (hash_table->nodes[i],
|
||||||
hash_table->key_destroy_func,
|
hash_table->key_destroy_func,
|
||||||
@ -214,7 +215,7 @@ g_hash_table_unref (GHashTable *hash_table)
|
|||||||
void
|
void
|
||||||
g_hash_table_destroy (GHashTable *hash_table)
|
g_hash_table_destroy (GHashTable *hash_table)
|
||||||
{
|
{
|
||||||
guint i;
|
gint i;
|
||||||
|
|
||||||
g_return_if_fail (hash_table != NULL);
|
g_return_if_fail (hash_table != NULL);
|
||||||
g_return_if_fail (hash_table->ref_count > 0);
|
g_return_if_fail (hash_table->ref_count > 0);
|
||||||
@ -542,7 +543,7 @@ g_hash_table_foreach_remove_or_steal (GHashTable *hash_table,
|
|||||||
gboolean notify)
|
gboolean notify)
|
||||||
{
|
{
|
||||||
GHashNode *node, *prev;
|
GHashNode *node, *prev;
|
||||||
guint i;
|
gint i;
|
||||||
guint deleted = 0;
|
guint deleted = 0;
|
||||||
|
|
||||||
for (i = 0; i < hash_table->size; i++)
|
for (i = 0; i < hash_table->size; i++)
|
||||||
|
20
glib/gmem.c
20
glib/gmem.c
@ -1265,20 +1265,22 @@ void g_blow_chunks (void) {}
|
|||||||
|
|
||||||
#endif /* DISABLE_MEM_POOLS */
|
#endif /* DISABLE_MEM_POOLS */
|
||||||
|
|
||||||
|
struct _GAllocator
|
||||||
|
{
|
||||||
|
gchar *name;
|
||||||
|
guint16 n_preallocs;
|
||||||
|
guint is_unused : 1;
|
||||||
|
guint type : 4;
|
||||||
|
GAllocator *last;
|
||||||
|
GMemChunk *mem_chunk;
|
||||||
|
gpointer free_list;
|
||||||
|
};
|
||||||
|
|
||||||
GAllocator*
|
GAllocator*
|
||||||
g_allocator_new (const gchar *name,
|
g_allocator_new (const gchar *name,
|
||||||
guint n_preallocs)
|
guint n_preallocs)
|
||||||
{
|
{
|
||||||
static const struct _GAllocator {
|
static const GAllocator dummy = {
|
||||||
gchar *name;
|
|
||||||
guint16 n_preallocs;
|
|
||||||
guint is_unused : 1;
|
|
||||||
guint type : 4;
|
|
||||||
GAllocator *last;
|
|
||||||
GMemChunk *mem_chunk;
|
|
||||||
gpointer free_list;
|
|
||||||
} dummy = {
|
|
||||||
"GAllocator is deprecated", 1, TRUE, 0, NULL, NULL, NULL,
|
"GAllocator is deprecated", 1, TRUE, 0, NULL, NULL, NULL,
|
||||||
};
|
};
|
||||||
/* some (broken) GAllocator uses depend on non-NULL allocators */
|
/* some (broken) GAllocator uses depend on non-NULL allocators */
|
||||||
|
@ -614,7 +614,7 @@ g_node_depth_traverse_level (GNode *node,
|
|||||||
GNodeTraverseFunc func,
|
GNodeTraverseFunc func,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
gint level;
|
guint level;
|
||||||
gboolean more_levels;
|
gboolean more_levels;
|
||||||
|
|
||||||
level = 0;
|
level = 0;
|
||||||
|
@ -730,7 +730,7 @@ g_static_rw_lock_init (GStaticRWLock* lock)
|
|||||||
*lock = init_lock;
|
*lock = init_lock;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void inline
|
inline static void
|
||||||
g_static_rw_lock_wait (GCond** cond, GStaticMutex* mutex)
|
g_static_rw_lock_wait (GCond** cond, GStaticMutex* mutex)
|
||||||
{
|
{
|
||||||
if (!*cond)
|
if (!*cond)
|
||||||
@ -738,7 +738,7 @@ g_static_rw_lock_wait (GCond** cond, GStaticMutex* mutex)
|
|||||||
g_cond_wait (*cond, g_static_mutex_get_mutex (mutex));
|
g_cond_wait (*cond, g_static_mutex_get_mutex (mutex));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void inline
|
inline static void
|
||||||
g_static_rw_lock_signal (GStaticRWLock* lock)
|
g_static_rw_lock_signal (GStaticRWLock* lock)
|
||||||
{
|
{
|
||||||
if (lock->want_to_write && lock->write_cond)
|
if (lock->want_to_write && lock->write_cond)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user