From 20f6cc2a10ba26860e7a6d27c100deadb5497772 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Wilmet?= Date: Wed, 5 Nov 2014 14:00:45 +0100 Subject: [PATCH] Simplify code that uses g_queue_insert_before() and insert_after() g_queue_insert_before() and g_queue_insert_after() now accept a NULL sibling. https://bugzilla.gnome.org/show_bug.cgi?id=736620 --- glib/gqueue.c | 5 +---- glib/tests/sequence.c | 16 +++------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/glib/gqueue.c b/glib/gqueue.c index d3c5ca5..3176614 100644 --- a/glib/gqueue.c +++ b/glib/gqueue.c @@ -1072,8 +1072,5 @@ g_queue_insert_sorted (GQueue *queue, while (list && func (list->data, data, user_data) < 0) list = list->next; - if (list) - g_queue_insert_before (queue, list, data); - else - g_queue_push_tail (queue, data); + g_queue_insert_before (queue, list, data); } diff --git a/glib/tests/sequence.c b/glib/tests/sequence.c index 8b1d64b..fcc8385 100644 --- a/glib/tests/sequence.c +++ b/glib/tests/sequence.c @@ -410,16 +410,6 @@ dump_info (SequenceInfo *seq) #endif } -/* A version of g_queue_insert_before() that appends if link is NULL */ -static void -queue_insert_before (SequenceInfo *seq, GList *link, gpointer data) -{ - if (link) - g_queue_insert_before (seq->queue, link, data); - else - g_queue_push_tail (seq->queue, data); -} - static void run_random_tests (gconstpointer d) { @@ -611,7 +601,7 @@ run_random_tests (gconstpointer d) new_iter = g_sequence_insert_before (iter, new_item (seq)); - queue_insert_before (seq, link, new_iter); + g_queue_insert_before (seq->queue, link, new_iter); } } break; @@ -630,7 +620,7 @@ run_random_tests (gconstpointer d) if (!link2) g_assert (g_sequence_iter_is_end (iter2)); - queue_insert_before (seq2, link2, link1->data); + g_queue_insert_before (seq2->queue, link2, link1->data); g_queue_delete_link (seq1->queue, link1); @@ -864,7 +854,7 @@ run_random_tests (gconstpointer d) Item *item = get_item (list->data); g_assert (dst->queue); - queue_insert_before (dst, dst_link, list->data); + g_queue_insert_before (dst->queue, dst_link, list->data); g_queue_delete_link (src->queue, list); g_assert (item->seq == src); -- 2.7.4