From 43761441c9bbb763ccde3ae2f7f5508f5cec70ec Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 6 Oct 2008 18:43:10 +0200 Subject: song: get rid of newNullSong() It didn't save us any lines of code nor did it do anything useful since we would overwrite everything anyways. --- src/song.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/song.c') diff --git a/src/song.c b/src/song.c index 9436df97c..75dd0257f 100644 --- a/src/song.c +++ b/src/song.c @@ -28,17 +28,6 @@ #include "os_compat.h" -Song *newNullSong(void) -{ - Song *song = xmalloc(sizeof(Song)); - - song->tag = NULL; - song->url = NULL; - song->type = SONG_TYPE_FILE; - song->parentDir = NULL; - - return song; -} Song *newSong(const char *url, enum song_type type, Directory * parentDir) { @@ -49,8 +38,8 @@ Song *newSong(const char *url, enum song_type type, Directory * parentDir) return NULL; } - song = newNullSong(); - + song = xmalloc(sizeof(*song)); + song->tag = NULL; song->url = xstrdup(url); song->type = type; song->parentDir = parentDir; -- cgit v1.2.3