gio/*: Use g_slist_free_full() convenience function
authorJavier Jardón <jjardon@gnome.org>
Thu, 5 Jan 2012 03:27:20 +0000 (04:27 +0100)
committerJavier Jardón <jjardon@gnome.org>
Thu, 5 Jan 2012 03:57:47 +0000 (04:57 +0100)
gio/gfilemonitor.c
gio/gmemoryinputstream.c

index 6bad280..27b800a 100644 (file)
@@ -195,8 +195,7 @@ g_file_monitor_dispose (GObject *object)
       g_source_unref (priv->pending_file_change_source);
       priv->pending_file_change_source = NULL;
     }
-  g_slist_foreach (priv->pending_file_changes, (GFunc) file_change_free, NULL);
-  g_slist_free (priv->pending_file_changes);
+  g_slist_free_full (priv->pending_file_changes, (GDestroyNotify) file_change_free);
   priv->pending_file_changes = NULL;
 
   /* Make sure we cancel on last unref */
index 2a57dbd..f990c7b 100644 (file)
@@ -160,8 +160,7 @@ g_memory_input_stream_finalize (GObject *object)
   stream = G_MEMORY_INPUT_STREAM (object);
   priv = stream->priv;
 
-  g_slist_foreach (priv->chunks, free_chunk, NULL);
-  g_slist_free (priv->chunks);
+  g_slist_free_full (priv->chunks, free_chunk);
 
   G_OBJECT_CLASS (g_memory_input_stream_parent_class)->finalize (object);
 }