Merge commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d'

* commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d':
  directory: reuse existing directory if found on update
  song: better handling of existing songs when rereading DB
  tag: merge clearMpdTag into tag_free
  song: start avoiding race in updateSongInfo
  command: get rid of specialized list handlers
  directory: simplify list update handling logic
  main_notify: define main_task so we can use it for assertions
  directory: streamline deletes
  song: start avoiding race in updateSongInfo
  playlist: small lines of code reduction
  Revert "Start using song pointers in core data structures"

Conflicts:
	src/playlist.c

1 files changed, 2 insertions, 12 deletions

diff --git a/src/tag.c b/src/tag.c
index 2dcaf4ef8..db446836c 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -296,12 +296,12 @@ void tag_clear_items_by_type(struct mpd_tag *tag, enum tag_type type)
 	}
 }
 
-static void clearMpdTag(struct mpd_tag *tag)
+void tag_free(struct mpd_tag *tag)
 {
 	int i;
 
 	pthread_mutex_lock(&tag_pool_lock);
-	for (i = 0; i < tag->numOfItems; i++)
+	for (i = tag->numOfItems; --i >= 0; )
 		tag_pool_put_item(tag->items[i]);
 	pthread_mutex_unlock(&tag_pool_lock);
 
@@ -314,16 +314,6 @@ static void clearMpdTag(struct mpd_tag *tag)
 		free(tag->items);
 	}
 
-	tag->items = NULL;
-
-	tag->numOfItems = 0;
-
-	tag->time = -1;
-}
-
-void tag_free(struct mpd_tag *tag)
-{
-	clearMpdTag(tag);
 	free(tag);
 }