comparison src/m3u/m3u.c @ 1266:df2d1c5f3786

clean up r1265 as Crazy_Hopper suggests.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Sat, 14 Jul 2007 16:03:57 +0900
parents 7c6a443ac48b
children 74e20cec44b4
comparison
equal deleted inserted replaced
1265:7c6a443ac48b 1266:df2d1c5f3786
154 { 154 {
155 GList *node; 155 GList *node;
156 gchar *outstr = NULL; 156 gchar *outstr = NULL;
157 VFSFile *file; 157 VFSFile *file;
158 Playlist *playlist = playlist_get_active(); 158 Playlist *playlist = playlist_get_active();
159 gchar *fn; 159 gchar *fn = NULL;
160 gchar *fileuri = NULL;
161 160
162 g_return_if_fail(filename != NULL); 161 g_return_if_fail(filename != NULL);
163 g_return_if_fail(playlist != NULL); 162 g_return_if_fail(playlist != NULL);
164 163
165 fileuri = g_filename_to_uri(filename, NULL, NULL); 164 fn = g_filename_to_uri(filename, NULL, NULL);
166 g_return_if_fail(fileuri != NULL); 165 g_return_if_fail(fn != NULL);
167 file = vfs_fopen(fileuri, "wb"); 166 file = vfs_fopen(fn, "wb");
168 g_free(fileuri); fileuri = NULL; 167 g_free(fn); fn = NULL;
169 g_return_if_fail(file != NULL); 168 g_return_if_fail(file != NULL);
170 169
171 if (cfg.use_pl_metadata) 170 if (cfg.use_pl_metadata)
172 vfs_fprintf(file, "#EXTM3U\n"); 171 vfs_fprintf(file, "#EXTM3U\n");
173 172
195 } 194 }
196 195
197 fn = g_filename_from_uri(entry->filename, NULL, NULL); 196 fn = g_filename_from_uri(entry->filename, NULL, NULL);
198 vfs_fprintf(file, "%s\n", fn ? fn : entry->filename); 197 vfs_fprintf(file, "%s\n", fn ? fn : entry->filename);
199 198
200 if (fn) 199 g_free(fn); fn = NULL;
201 g_free(fn);
202 } 200 }
203 201
204 PLAYLIST_UNLOCK(playlist->mutex); 202 PLAYLIST_UNLOCK(playlist->mutex);
205 203
206 vfs_fclose(file); 204 vfs_fclose(file);