# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189208274 -10800
# Node ID 9d26307a9d5752c15fe33855101ef483e78cd736
# Parent  b0089144466db9b49928b71d9b6249949c09308e# Parent  01c1650d8427c2435065496cc306fe9fb58f3706
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 01c1650d8427 -r 9d26307a9d57 src/m3u/m3u.c
--- a/src/m3u/m3u.c	Sat Sep 08 00:43:46 2007 +0200
+++ b/src/m3u/m3u.c	Sat Sep 08 02:37:54 2007 +0300
@@ -92,8 +92,7 @@
     if ((file = vfs_fopen(uri ? uri : filename, "rb")) == NULL)
         return;
 
-    if (uri)
-        g_free(uri);
+    g_free(uri);
 
     line = g_malloc(line_len);
     while (vfs_fgets(line, line_len, file)) {
@@ -134,9 +133,7 @@
 
         uri = g_filename_to_uri(line, NULL, NULL);
         playlist_load_ins_file(playlist, uri ? uri : line, filename, pos, ext_title, ext_len);
-
-        if (uri)
-            g_free(uri);
+        g_free(uri);
 
         str_replace_in(&ext_title, NULL);
         ext_len = -1;
@@ -163,7 +160,7 @@
 
     fn = g_filename_to_uri(filename, NULL, NULL);
     file = vfs_fopen(fn ? fn : filename, "wb");
-    g_free(fn); fn = NULL;
+    g_free(fn);
     g_return_if_fail(file != NULL);
 
     if (cfg.use_pl_metadata)
@@ -194,8 +191,7 @@
 
         fn = g_filename_from_uri(entry->filename, NULL, NULL);
         vfs_fprintf(file, "%s\n", fn ? fn : entry->filename);
-
-        g_free(fn); fn = NULL;
+        g_free(fn);
     }
 
     PLAYLIST_UNLOCK(playlist->mutex);