Merge branch 'ew/directory'

* ew/directory:
  directory: remove redundant sanitizePathDup
  update: move path sanitation up the stack to avoid extra copies
  clean up updateInit calling and error handling
  directory: isRootDirectory() is a one-liner
  directory: writeDirectoryInfo propagates errors
  directory: make it clear that DIRECTORY_MTIME is deprecated
  directory: remove "Mp3" references
  playlist: deleteASongFromPlaylist takes a const Song *
  songvec: songvec_delete takes a const Song pointer
  directory: remove shortname arguments everywhere
  path: add mpd_basename() function
  directory.h: remove directory_sigChldHandler decl
  directory: replace DirectoryList with dirvec
  directory: remove unused CPP defines
  songvec_free => songvec_destroy
  directory.c: kill unnecessary includes

1 files changed, 2 insertions, 2 deletions

diff --git a/src/songvec.c b/src/songvec.c
index 842e7afcd..579ac7033 100644
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -30,7 +30,7 @@ Song *songvec_find(struct songvec *sv, const char *url)
 	return NULL;
 }
 
-int songvec_delete(struct songvec *sv, Song *del)
+int songvec_delete(struct songvec *sv, const Song *del)
 {
 	int i;
 
@@ -59,7 +59,7 @@ void songvec_add(struct songvec *sv, Song *add)
 	sv->base[sv->nr - 1] = add;
 }
 
-void songvec_free(struct songvec *sv)
+void songvec_destroy(struct songvec *sv)
 {
 	if (sv->base) {
 		free(sv->base);