luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code that uses g_queue_insert_before() and insert_after()

Browse Source 
g_queue_insert_before() and g_queue_insert_after() now accept a NULL
sibling.

https://bugzilla.gnome.org/show_bug.cgi?id=736620
This commit is contained in:
Sébastien Wilmet 2014-11-05 14:00:45 +01:00
parent 8a90f5e9f6
commit 20f6cc2a10
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gqueue.c
View File

@ -1072,8 +1072,5 @@ g_queue_insert_sorted (GQueue *queue,
while (list && func (list->data, data, user_data) < 0) while (list && func (list->data, data, user_data) < 0)
list = list->next; list = list->next;
if (list) g_queue_insert_before (queue, list, data);
g_queue_insert_before (queue, list, data);
else
g_queue_push_tail (queue, data);
} }

16
glib/tests/sequence.c
View File

@ -410,16 +410,6 @@ dump_info (SequenceInfo *seq)
#endif #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 static void
run_random_tests (gconstpointer d) run_random_tests (gconstpointer d)
{ {
@ -611,7 +601,7 @@ run_random_tests (gconstpointer d)
new_iter = g_sequence_insert_before (iter, new_item (seq)); 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; break;
@ -630,7 +620,7 @@ run_random_tests (gconstpointer d)
if (!link2) if (!link2)
g_assert (g_sequence_iter_is_end (iter2)); 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); g_queue_delete_link (seq1->queue, link1);
@ -864,7 +854,7 @@ run_random_tests (gconstpointer d)
Item *item = get_item (list->data); Item *item = get_item (list->data);
g_assert (dst->queue); 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_queue_delete_link (src->queue, list);
g_assert (item->seq == src); g_assert (item->seq == src);