luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-25 08:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Have g_queue_remove() return a boolean

Browse Source 
g_queue_remove() should return a boolean so callers can verify that an
element was found and removed, as in the following example:

    if (g_queue_remove (queue, referenced_object))
        g_object_unref (referenced_object);

Similarly, g_queue_remove_all() should return the number of elements
found and removed.

https://bugzilla.gnome.org/show_bug.cgi?id=632294
This commit is contained in:
Matthew Barnes 2010-10-16 07:40:44 -04:00 committed by Matthias Clasen
parent 496157ffd3
commit f065d7d60e
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glib/gqueue.c
View File

@ -880,20 +880,24 @@ g_queue_index (GQueue *queue,
* *
* Removes the first element in @queue that contains @data. * Removes the first element in @queue that contains @data.
* *
* Return value: %TRUE if @data was found and removed from @queue
*
* Since: 2.4 * Since: 2.4
**/ **/
void gboolean
g_queue_remove (GQueue *queue, g_queue_remove (GQueue *queue,
gconstpointer data) gconstpointer data)
{ {
GList *link; GList *link;
g_return_if_fail (queue != NULL); g_return_val_if_fail (queue != NULL, FALSE);
link = g_list_find (queue->head, data); link = g_list_find (queue->head, data);
if (link) if (link)
g_queue_delete_link (queue, link); g_queue_delete_link (queue, link);
return (link != NULL);
} }
/** /**
@ -903,15 +907,20 @@ g_queue_remove (GQueue *queue,
* *
* Remove all elements whose data equals @data from @queue. * Remove all elements whose data equals @data from @queue.
* *
* Return value: the number of elements removed from @queue
*
* Since: 2.4 * Since: 2.4
**/ **/
void guint
g_queue_remove_all (GQueue *queue, g_queue_remove_all (GQueue *queue,
gconstpointer data) gconstpointer data)
{ {
GList *list; GList *list;
guint old_length;
g_return_if_fail (queue != NULL); g_return_val_if_fail (queue != NULL, 0);
old_length = queue->length;
list = queue->head; list = queue->head;
while (list) while (list)
@ -923,6 +932,8 @@ g_queue_remove_all (GQueue *queue,
list = next; list = next;
} }
return (old_length - queue->length);
} }
/** /**

4
glib/gqueue.h
View File

@ -85,9 +85,9 @@ gpointer g_queue_peek_nth (GQueue *queue,
guint n); guint n);
gint g_queue_index (GQueue *queue, gint g_queue_index (GQueue *queue,
gconstpointer data); gconstpointer data);
void g_queue_remove (GQueue *queue, gboolean g_queue_remove (GQueue *queue,
gconstpointer data); gconstpointer data);
void g_queue_remove_all (GQueue *queue, guint g_queue_remove_all (GQueue *queue,
gconstpointer data); gconstpointer data);
void g_queue_insert_before (GQueue *queue, void g_queue_insert_before (GQueue *queue,
GList *sibling, GList *sibling,