Merge branch 'mk/client-merge'

* mk/client-merge: (49 commits)
  client: shorten names of the struct client variables
  client: simplified client_read()
  client: client_input_received() returns 0
  client: check for COMMAND_RETURN_CLOSE
  client: renamed local variable "selret" to "ret"
  client: moved CLOSE/KILL check after client_process_line()
  client: don't check FD_ISSET(client->fd) on expired client
  client: removed assert(client->fd)>=0
  fix -Wcast-qual -Wwrite-strings warnings
  playlist: return -1 after assert(0)
  command: concatenate strings at compile time
  audio: don't pass "fd" to {en,dis}ableAudioDevice()
  volume: don't pass "fd" to changeVolumeLevel()
  directory: printDirectoryInfo() does not call commandError()
  directory: don't pass fd to traverseAllIn()
  directory: don't pass fd to traverseAllIn() callbacks
  playlist: PlaylistInfo() does not call commandError()
  playlist: don't pass "fd" to storedPlaylist.c functions
  playlist: don't pass "fd" to playlist.c functions
  playlist: showPlaylist() and shufflePlaylist() cannot fail
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/src/stats.c b/src/stats.c
index c576d2870..4555907db 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -40,7 +40,7 @@ struct visit_data {
 	struct strset *set;
 };
 
-static int visit_tag_items(mpd_unused int fd, Song *song, void *_data)
+static int visit_tag_items(Song *song, void *_data)
 {
 	const struct visit_data *data = _data;
 	unsigned i;
@@ -65,7 +65,7 @@ static unsigned int getNumberOfTagItems(int type)
 	data.type = type;
 	data.set = strset_new();
 
-	traverseAllIn(STDERR_FILENO, NULL, visit_tag_items, NULL, &data);
+	traverseAllIn(NULL, visit_tag_items, NULL, &data);
 
 	ret = strset_size(data.set);
 	strset_free(data.set);