aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-03-14 14:20:08 +0100
committerMax Kellermann <max@duempel.org>2009-03-14 14:20:08 +0100
commitbe38ad5b93e1a232c92e2c8386d7ceeb1ca91669 (patch)
treea5843494f64986f3d5d222ec752b64dd7d6f8ac0
parent24da9410fa0d343acf35a47afcb666398d032aea (diff)
downloadmpd-be38ad5b93e1a232c92e2c8386d7ceeb1ca91669.tar.gz
mpd-be38ad5b93e1a232c92e2c8386d7ceeb1ca91669.tar.xz
mpd-be38ad5b93e1a232c92e2c8386d7ceeb1ca91669.zip
sticker: don't export sticker_list_values()
sticker_list_values() is only used internally in sticker.c. Remove sticker_song_list_values() completely, it is superseded by sticker_song_get().
-rw-r--r--src/song_sticker.c16
-rw-r--r--src/song_sticker.h7
-rw-r--r--src/sticker.c2
-rw-r--r--src/sticker.h8
4 files changed, 1 insertions, 32 deletions
diff --git a/src/song_sticker.c b/src/song_sticker.c
index 951b28871..54792678a 100644
--- a/src/song_sticker.c
+++ b/src/song_sticker.c
@@ -40,22 +40,6 @@ sticker_song_get_value(const struct song *song, const char *name)
return value;
}
-GHashTable *
-sticker_song_list_values(const struct song *song)
-{
- char *uri;
- GHashTable *hash;
-
- assert(song != NULL);
- assert(song_in_database(song));
-
- uri = song_get_uri(song);
- hash = sticker_list_values("song", uri);
- g_free(uri);
-
- return hash;
-}
-
bool
sticker_song_set_value(const struct song *song,
const char *name, const char *value)
diff --git a/src/song_sticker.h b/src/song_sticker.h
index 3b27e91b6..9b32c9215 100644
--- a/src/song_sticker.h
+++ b/src/song_sticker.h
@@ -42,13 +42,6 @@ sticker_song_set_value(const struct song *song,
const char *name, const char *value);
/**
- * Returns a hash table of key value pairs from a song's sticker record.
- * The caller must free the GHashTable with g_hash_table_destroy().
- */
-GHashTable *
-sticker_song_list_values(const struct song *song);
-
-/**
* Deletes a sticker from the database. All values are deleted.
*/
bool
diff --git a/src/sticker.c b/src/sticker.c
index cad4e1c97..cb845001b 100644
--- a/src/sticker.c
+++ b/src/sticker.c
@@ -194,7 +194,7 @@ sticker_load_value(const char *type, const char *uri, const char *name)
return value;
}
-GHashTable *
+static GHashTable *
sticker_list_values(const char *type, const char *uri)
{
int ret;
diff --git a/src/sticker.h b/src/sticker.h
index 9ca740d45..3de4801f9 100644
--- a/src/sticker.h
+++ b/src/sticker.h
@@ -67,14 +67,6 @@ bool
sticker_enabled(void);
/**
- * Populates a GHashTable with GStrings of sticker keys and values
- * from an object's sticker record. The caller must free the returned
- * GHashTable with g_hash_list_destroy().
- */
-GHashTable *
-sticker_list_values(const char *type, const char *uri);
-
-/**
* Returns one value from an object's sticker record. The caller must
* free the return value with g_free().
*/