From cd1e02c8a88dd3e55cbde3056906dfbd3207f30e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 3 Oct 2008 18:11:47 -0700 Subject: tag: merge clearMpdTag into tag_free avoid some redundant clearing logic as well, since the tag is getting freed. --- src/tag.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src') 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); } -- cgit v1.2.3