From be38ad5b93e1a232c92e2c8386d7ceeb1ca91669 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 14 Mar 2009 14:20:08 +0100
Subject: 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().
---
 src/song_sticker.c | 16 ----------------
 src/song_sticker.h |  7 -------
 src/sticker.c      |  2 +-
 src/sticker.h      |  8 --------
 4 files changed, 1 insertion(+), 32 deletions(-)

(limited to 'src')

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
@@ -41,13 +41,6 @@ bool
 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.
  */
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
@@ -66,14 +66,6 @@ sticker_global_finish(void);
 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().
-- 
cgit v1.2.3