From 3ad41fdda63edee8d2acadbc564137939fc5d1ab Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sat, 15 Jul 2006 05:04:16 +0000
Subject: [CLEANUP] Remove unused code Cleanup whitespace->tabs

git-svn-id: https://svn.musicpd.org/mpd/trunk@4347 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/song.c  | 26 +++++++-------------------
 src/song.h  |  2 --
 src/stats.c |  3 ---
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/song.c b/src/song.c
index 94d7896c6..ed27667b4 100644
--- a/src/song.c
+++ b/src/song.c
@@ -63,7 +63,7 @@ Song * newSong(char * url, int type, Directory * parentDir) {
 	assert(type == SONG_TYPE_URL || parentDir);
 
 	if(song->type == SONG_TYPE_FILE) {
-                InputPlugin * plugin;
+		InputPlugin * plugin;
 		unsigned int next = 0;
 		char * song_url = getSongUrl(song);
 		char * abs_path = rmp2amp(utf8ToFsCharset(song_url));
@@ -115,7 +115,7 @@ Song * addSongToList(SongList * list, char * url, char * utf8path,
 	}
 
 	if(song==NULL) return NULL;
-	
+
 	insertInList(list, song->url, (void *)song);
 
 	return song;
@@ -169,7 +169,7 @@ void writeSongInfoFromList(FILE * fp, SongList * list) {
 	myfprintf(fp,"%s\n",SONG_END);
 }
 
-void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
+static void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
 		Song * song)
 {
 	ListNode * nodeTemp;
@@ -266,7 +266,7 @@ void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir) {
 			exit(EXIT_FAILURE);
 		}
 	}
-	
+
 	if(song) {
 		insertSongIntoList(list, &nextSongNode, song->url, song);
 		song = NULL;
@@ -281,7 +281,7 @@ void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir) {
 
 int updateSongInfo(Song * song) {
 	if(song->type == SONG_TYPE_FILE) {
-                InputPlugin * plugin;
+		InputPlugin * plugin;
 		unsigned int next = 0;
 		char * song_url = getSongUrl(song);
 		char * abs_path = rmp2amp(song_url);
@@ -292,26 +292,14 @@ int updateSongInfo(Song * song) {
 
 		while(!song->tag && (plugin = isMusic(song_url,
 						&(song->mtime), next++))) {
-		        song->tag = plugin->tagDupFunc(abs_path);
-                }
+			song->tag = plugin->tagDupFunc(abs_path);
+		}
 		if(!song->tag || song->tag->time<0) return -1;
 	}
 
 	return 0;
 }
 
-Song * songDup(Song * song) {
-	Song * ret = malloc(sizeof(Song));
-
-	ret->url = strdup(song->url);
-	ret->mtime = song->mtime;
-	ret->tag = mpdTagDup(song->tag);
-	ret->type = song->type;
-	ret->parentDir = song->parentDir;
-
-	return ret;
-}
-
 /* pass song = NULL to reset, we do this freeJustSong(), so that if
  * 	we free and recreate this memory we make sure to print it correctly*/
 char * getSongUrl(Song * song) {
diff --git a/src/song.h b/src/song.h
index f880adea5..36e3748b5 100644
--- a/src/song.h
+++ b/src/song.h
@@ -69,8 +69,6 @@ void readSongInfoIntoList(FILE * fp, SongList * list,
 
 int updateSongInfo(Song * song);
 
-Song * songDup(Song * song);
-
 void printSongUrl(FILE * fp, Song * song);
 
 char * getSongUrl(Song * song);
diff --git a/src/stats.c b/src/stats.c
index 2b7f6c218..5f03874c3 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -31,8 +31,6 @@ Stats stats;
 void initStats() {
 	stats.daemonStart = time(NULL);
 	stats.numberOfSongs = 0;
-	/*stats.playTime = 0;
-	stats.songsPlayed = 0;*/
 }
 
 int printStats(FILE * fp) {
@@ -42,7 +40,6 @@ int printStats(FILE * fp) {
 	myfprintf(fp,"uptime: %li\n",time(NULL)-stats.daemonStart);
 	myfprintf(fp,"playtime: %li\n",(long)(getPlayerTotalPlayTime()+0.5));
 	myfprintf(fp,"db_playtime: %li\n",stats.dbPlayTime);
-	/*myfprintf(fp,"songs_played: %li\n",stats.songsPlayed);*/
 	myfprintf(fp,"db_update: %li\n",getDbModTime());
 	return 0;
 }
-- 
cgit v1.2.3