1 files changed, 43 insertions, 36 deletions

diff --git a/src/lib/despotify/DespotifyUtils.cxx b/src/lib/despotify/DespotifyUtils.cxx
index f67679c50..e62994c6a 100644
--- a/src/lib/despotify/DespotifyUtils.cxx
+++ b/src/lib/despotify/DespotifyUtils.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigOption.hxx"
 #include "util/Domain.hxx"
+#include "util/Macros.hxx"
 #include "Log.hxx"
 
 extern "C" {
@@ -42,24 +43,21 @@ static void
 callback(struct despotify_session* ds, int sig,
 	 void *data, gcc_unused void *callback_data)
 {
-	size_t i;
-
-	for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) {
+	for (size_t i = 0; i < ARRAY_SIZE(registered_callbacks); ++i) {
 		void (*cb)(struct despotify_session *, int, void *, void *) = registered_callbacks[i];
 		void *cb_data = registered_callback_data[i];
 
-		if (cb)
+		if (cb != nullptr)
 			cb(ds, sig, data, cb_data);
 	}
 }
 
-bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int, void *, void *),
-		void *cb_data)
+bool
+mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int,
+					   void *, void *),
+				void *cb_data)
 {
-	size_t i;
-
-	for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) {
-
+	for (size_t i = 0; i < ARRAY_SIZE(registered_callbacks); ++i) {
 		if (!registered_callbacks[i]) {
 			registered_callbacks[i] = cb;
 			registered_callback_data[i] = cb_data;
@@ -71,12 +69,11 @@ bool mpd_despotify_register_callback(void (*cb)(struct despotify_session *, int,
 	return false;
 }
 
-void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int, void *, void *))
+void
+mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, int,
+					     void *, void *))
 {
-	size_t i;
-
-	for (i = 0; i < sizeof(registered_callbacks) / sizeof(registered_callbacks[0]); i++) {
-
+	for (size_t i = 0; i < ARRAY_SIZE(registered_callbacks); ++i) {
 		if (registered_callbacks[i] == cb) {
 			registered_callbacks[i] = nullptr;
 		}
@@ -86,42 +83,50 @@ void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, in
 Tag
 mpd_despotify_tag_from_track(const ds_track &track)
 {
-	char tracknum[20];
-	char comment[80];
-	char date[20];
-
 	if (!track.has_meta_data)
 		return Tag();
 
 	TagBuilder tag;
-	snprintf(tracknum, sizeof(tracknum), "%d", track.tracknumber);
-	snprintf(date, sizeof(date), "%d", track.year);
-	snprintf(comment, sizeof(comment), "Bitrate %d Kbps, %sgeo restricted",
-		 track.file_bitrate / 1000,
-		 track.geo_restricted ? "" : "not ");
+
+	{
+		char tracknum[20];
+		snprintf(tracknum, sizeof(tracknum), "%d", track.tracknumber);
+		tag.AddItem(TAG_TRACK, tracknum);
+	}
+
+	{
+		char date[20];
+		snprintf(date, sizeof(date), "%d", track.year);
+		tag.AddItem(TAG_DATE, date);
+	}
+
+	{
+		char comment[80];
+		snprintf(comment, sizeof(comment),
+			 "Bitrate %d Kbps, %sgeo restricted",
+			 track.file_bitrate / 1000,
+			 track.geo_restricted ? "" : "not ");
+		tag.AddItem(TAG_COMMENT, comment);
+	}
+
 	tag.AddItem(TAG_TITLE, track.title);
 	tag.AddItem(TAG_ARTIST, track.artist->name);
-	tag.AddItem(TAG_TRACK, tracknum);
 	tag.AddItem(TAG_ALBUM, track.album);
-	tag.AddItem(TAG_DATE, date);
-	tag.AddItem(TAG_COMMENT, comment);
 	tag.SetDuration(SignedSongTime::FromMS(track.length));
 
 	return tag.Commit();
 }
 
-struct despotify_session *mpd_despotify_get_session(void)
+struct despotify_session *
+mpd_despotify_get_session()
 {
-	const char *user;
-	const char *passwd;
-	bool high_bitrate;
-
 	if (g_session)
 		return g_session;
 
-	user = config_get_string(CONF_DESPOTIFY_USER, nullptr);
-	passwd = config_get_string(CONF_DESPOTIFY_PASSWORD, nullptr);
-	high_bitrate = config_get_bool(CONF_DESPOTIFY_HIGH_BITRATE, true);
+	const char *const user =
+		config_get_string(CONF_DESPOTIFY_USER, nullptr);
+	const char *const passwd =
+		config_get_string(CONF_DESPOTIFY_PASSWORD, nullptr);
 
 	if (user == nullptr || passwd == nullptr) {
 		LogDebug(despotify_domain,
@@ -134,6 +139,8 @@ struct despotify_session *mpd_despotify_get_session(void)
 		return nullptr;
 	}
 
+	const bool high_bitrate =
+		config_get_bool(CONF_DESPOTIFY_HIGH_BITRATE, true);
 	g_session = despotify_init_client(callback, nullptr,
 					  high_bitrate, true);
 	if (!g_session) {