From: Max Kellermann <max@duempel.org>
Date: Sat, 10 Oct 2009 16:13:49 +0000 (+0200)
Subject: mpdclient: merged duplicate code into recv_tag_values()
X-Git-Tag: release-0.16~132
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=41ff25c24606d22cb322526742aa6319191518bd;p=ncmpc.git

mpdclient: merged duplicate code into recv_tag_values()
---

diff --git a/src/mpdclient.c b/src/mpdclient.c
index a82278a..9b896e2 100644
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
@@ -759,12 +759,25 @@ mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl)
 	return mpdclient_finish_command(c);
 }
 
+static GList *
+recv_tag_values(struct mpd_connection *connection, enum mpd_tag_type tag)
+{
+	GList *list = NULL;
+	struct mpd_pair *pair;
+
+	while ((pair = mpd_recv_pair_tag(connection, tag)) != NULL) {
+		list = g_list_append(list, g_strdup(pair->value));
+		mpd_return_pair(connection, pair);
+	}
+
+	return list;
+}
+
 GList *
 mpdclient_get_artists(struct mpdclient *c)
 {
 	struct mpd_connection *connection = mpdclient_get_connection(c);
-	GList *list = NULL;
-	struct mpd_pair *pair;
+	GList *list;
 
 	if (connection == NULL)
 		return NULL;
@@ -772,11 +785,7 @@ mpdclient_get_artists(struct mpdclient *c)
 	mpd_search_db_tags(connection, MPD_TAG_ARTIST);
 	mpd_search_commit(connection);
 
-	while ((pair = mpd_recv_pair_tag(connection,
-					 MPD_TAG_ARTIST)) != NULL) {
-		list = g_list_append(list, g_strdup(pair->value));
-		mpd_return_pair(connection, pair);
-	}
+	list = recv_tag_values(connection, MPD_TAG_ARTIST);
 
 	if (!mpdclient_finish_command(c))
 		return string_list_free(list);
@@ -788,8 +797,7 @@ GList *
 mpdclient_get_albums(struct mpdclient *c, const gchar *artist_utf8)
 {
 	struct mpd_connection *connection = mpdclient_get_connection(c);
-	GList *list = NULL;
-	struct mpd_pair *pair;
+	GList *list;
 
 	if (connection == NULL)
 		return NULL;
@@ -801,11 +809,7 @@ mpdclient_get_albums(struct mpdclient *c, const gchar *artist_utf8)
 					      MPD_TAG_ARTIST, artist_utf8);
 	mpd_search_commit(connection);
 
-	while ((pair = mpd_recv_pair_tag(connection,
-					 MPD_TAG_ALBUM)) != NULL) {
-		list = g_list_append(list, g_strdup(pair->value));
-		mpd_return_pair(connection, pair);
-	}
+	list = recv_tag_values(connection, MPD_TAG_ALBUM);
 
 	if (!mpdclient_finish_command(c))
 		return string_list_free(list);