From fb4d55c5b37cd2f70b4cc3b3aed5d851fe67a7e6 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 6 Oct 2008 18:35:41 +0200 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 dc2037473..28f1d6eae 100644 --- a/src/tag.c +++ b/src/tag.c @@ -273,12 +273,12 @@ void tag_clear_items_by_type(struct tag *tag, enum tag_type type) } } -static void clearMpdTag(struct tag *tag) +void tag_free(struct 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); @@ -291,16 +291,6 @@ static void clearMpdTag(struct tag *tag) free(tag->items); } - tag->items = NULL; - - tag->numOfItems = 0; - - tag->time = -1; -} - -void tag_free(struct tag *tag) -{ - clearMpdTag(tag); free(tag); } -- cgit v1.2.3