From b24dbaef8dc73ccff85ae3948ff508c1cab4ede9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 29 Aug 2008 09:38:33 +0200 Subject: tag: converted tag_item.value to a char array The value is stored in the same memory allocation as the tag_item struct; this saves memory because we do not store the value pointer anymore. Also remove the getTagItemString()/removeTagItemString() dummies. --- src/tag.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/tag.c') diff --git a/src/tag.c b/src/tag.c index 311b49d50..2a4b27488 100644 --- a/src/tag.c +++ b/src/tag.c @@ -248,7 +248,6 @@ static void deleteItem(struct mpd_tag *tag, int idx) assert(idx < tag->numOfItems); tag->numOfItems--; - removeTagItemString(tag->items[idx]->type, tag->items[idx]->value); free(tag->items[idx]); /* free(tag->items[idx].value); */ @@ -284,7 +283,6 @@ static void clearMpdTag(struct mpd_tag *tag) int i; for (i = 0; i < tag->numOfItems; i++) { - removeTagItemString(tag->items[i]->type, tag->items[i]->value); /* free(tag->items[i].value); */ free(tag->items[i]); } @@ -374,9 +372,10 @@ static void appendToTagItems(struct mpd_tag *tag, enum tag_type type, tag->items = xrealloc(tag->items, tag->numOfItems * sizeof(*tag->items)); - tag->items[i] = xmalloc(sizeof(*tag->items[i])); + len = strlen(duplicated); + tag->items[i] = xmalloc(sizeof(*tag->items[i]) + len); tag->items[i]->type = type; - tag->items[i]->value = getTagItemString(type, duplicated); + memcpy(tag->items[i]->value, duplicated, len + 1); free(duplicated); } -- cgit v1.2.3