From 43761441c9bbb763ccde3ae2f7f5508f5cec70ec Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
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 ++-------------
 src/song.h      |  2 --
 src/song_save.c |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'src')

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;
diff --git a/src/song.h b/src/song.h
index 0b55a0f3f..f7466e24c 100644
--- a/src/song.h
+++ b/src/song.h
@@ -42,8 +42,6 @@ typedef struct _Song {
 	time_t mtime;
 } Song;
 
-Song *newNullSong(void);
-
 Song *newSong(const char *url, enum song_type type,
 	      struct _Directory *parentDir);
 
diff --git a/src/song_save.c b/src/song_save.c
index cc5e4e4dd..3cb17f97b 100644
--- a/src/song_save.c
+++ b/src/song_save.c
@@ -111,7 +111,7 @@ void readSongInfoIntoList(FILE *fp, struct songvec *sv,
 			if (song)
 				insertSongIntoList(sv, song);
 
-			song = newNullSong();
+			song = xmalloc(sizeof(*song));
 			song->url = xstrdup(buffer + strlen(SONG_KEY));
 			song->type = SONG_TYPE_FILE;
 			song->parentDir = parentDir;
-- 
cgit v1.2.3