aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-09-23 22:37:33 +0200
committerMax Kellermann <max@duempel.org>2008-09-23 22:37:33 +0200
commit28d39948d72b8c26b2863a167149c2c2ca232062 (patch)
tree3c6663974d462acf21c3ce3dbe83309a94fab694
parent3f0ae13c4b409bcf39d926f5e73d5eb0feff6eb3 (diff)
downloadmpd-28d39948d72b8c26b2863a167149c2c2ca232062.tar.gz
mpd-28d39948d72b8c26b2863a167149c2c2ca232062.tar.xz
mpd-28d39948d72b8c26b2863a167149c2c2ca232062.zip
songvec: remove songvec_prune
Any pruned files will be noticed during update and pruned from the live database, so this inefficient function can go away and never come back.
-rw-r--r--src/song_save.c3
-rw-r--r--src/songvec.c23
-rw-r--r--src/songvec.h2
3 files changed, 0 insertions, 28 deletions
diff --git a/src/song_save.c b/src/song_save.c
index 27cfcd8e6..cc5e4e4dd 100644
--- a/src/song_save.c
+++ b/src/song_save.c
@@ -149,7 +149,4 @@ void readSongInfoIntoList(FILE *fp, struct songvec *sv,
if (song)
insertSongIntoList(sv, song);
-
- if (isUpdatingDB()) /* only needed until we get rid of forked update */
- songvec_prune(sv);
}
diff --git a/src/songvec.c b/src/songvec.c
index 620338781..f879830dc 100644
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -64,26 +64,3 @@ void songvec_free(struct songvec *sv)
sv->base = NULL;
sv->nr = 0;
}
-
-/*
- * Removes missing songs from a songvec. This function is only temporary
- * as updating will be moved into a thread and updating shared memory...
- */
-#include "path.h"
-#include "ls.h"
-void songvec_prune(struct songvec *sv)
-{
- int i;
- char tmp[MPD_PATH_MAX];
- struct stat sb;
-
- for (i = sv->nr; --i >= 0; ) {
- Song *song = sv->base[i];
- assert(song);
- if (!myStat(get_song_url(tmp, song), &sb))
- continue;
- songvec_delete(sv, song);
- freeSong(song);
- i = sv->nr;
- }
-}
diff --git a/src/songvec.h b/src/songvec.h
index ada7c262d..f346b5277 100644
--- a/src/songvec.h
+++ b/src/songvec.h
@@ -19,6 +19,4 @@ void songvec_add(struct songvec *sv, Song *add);
void songvec_free(struct songvec *sv);
-void songvec_prune(struct songvec *sv);
-
#endif /* SONGVEC_H */