mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

iterator: Allow to use NULL as object for the single iterator

Browse source
This commit is contained in:
Sebastian Dröge 2009-08-26 16:51:32 +02:00
parent b2cab40745
commit a1ae8a3a3e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gstiterator.c
View file

@ -674,7 +674,7 @@ static GstIteratorResult
gst_single_object_iterator_iterator_next (GstSingleObjectIterator * it,
gpointer * result)
{
if (it->visited) {
if (it->visited || !it->object) {
*result = NULL;
return GST_ITERATOR_DONE;
}
@ -692,7 +692,8 @@ gst_single_object_iterator_resync (GstSingleObjectIterator * it)
static void
gst_single_object_iterator_free (GstSingleObjectIterator * it)
{
it->free (it->object);
if (it->object)
it->free (it->object);
g_free (it);
}
@ -717,7 +718,6 @@ gst_iterator_new_single (GType type, gpointer object, GstCopyFunction copy,
{
GstSingleObjectIterator *result;
g_return_val_if_fail (object != NULL, NULL);
g_return_val_if_fail (copy != NULL, NULL);
g_return_val_if_fail (free != NULL, NULL);
@ -728,7 +728,7 @@ gst_iterator_new_single (GType type, gpointer object, GstCopyFunction copy,
(GstIteratorResyncFunction) gst_single_object_iterator_resync,
(GstIteratorFreeFunction) gst_single_object_iterator_free);
result->object = copy (object);
result->object = (object) ? copy (object) : NULL;
result->copy = copy;
result->free = free;
result->visited = FALSE;