aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-09-29 12:17:13 +0200
committerMax Kellermann <max@duempel.org>2008-09-29 12:17:13 +0200
commit6075119f0ae9b20c89f31b496918cc6508f16a48 (patch)
treeafb2d907af865936efc0b219b7c245118775e124
parent5ec578119f5a62a1ca7fbf8e6c429a73ecbda3b3 (diff)
downloadmpd-6075119f0ae9b20c89f31b496918cc6508f16a48.tar.gz
mpd-6075119f0ae9b20c89f31b496918cc6508f16a48.tar.xz
mpd-6075119f0ae9b20c89f31b496918cc6508f16a48.zip
songvec_free => songvec_destroy
"free" implies the songvec structure itself is freed, which is not the case.
-rw-r--r--src/directory.c2
-rw-r--r--src/songvec.c2
-rw-r--r--src/songvec.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/directory.c b/src/directory.c
index 36728735e..ad437f4fd 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -220,7 +220,7 @@ static Directory *newDirectory(const char *dirname, Directory * parent)
static void freeDirectory(Directory * directory)
{
freeDirectoryList(directory->subDirectories);
- songvec_free(&directory->songs);
+ songvec_destroy(&directory->songs);
if (directory->path)
free(directory->path);
free(directory);
diff --git a/src/songvec.c b/src/songvec.c
index 3d0eaa02f..578766bcc 100644
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -58,7 +58,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);
diff --git a/src/songvec.h b/src/songvec.h
index f346b5277..e374798be 100644
--- a/src/songvec.h
+++ b/src/songvec.h
@@ -17,6 +17,6 @@ int songvec_delete(struct songvec *sv, Song *del);
void songvec_add(struct songvec *sv, Song *add);
-void songvec_free(struct songvec *sv);
+void songvec_destroy(struct songvec *sv);
#endif /* SONGVEC_H */