4 files changed, 5 insertions, 20 deletions
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);
 }
diff --git a/src/tag.h b/src/tag.h
index 4ee93ee1f..6452691be 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -41,8 +41,8 @@ extern const char *mpdTagItemKeys[];
 
 struct tag_item {
 	enum tag_type type;
-	char *value;
-};
+	char value[1];
+} mpd_unused;
 
 struct mpd_tag {
 	int time;
diff --git a/src/tagTracker.c b/src/tagTracker.c
index fdc535823..bea58ae4c 100644
--- a/src/tagTracker.c
+++ b/src/tagTracker.c
@@ -38,16 +38,6 @@ struct visited {
 static struct visited *visited_heads[TAG_NUM_OF_ITEM_TYPES];
 static unsigned num_visited[TAG_NUM_OF_ITEM_TYPES];
 
-char *getTagItemString(int type mpd_unused, char *string)
-{
-	return xstrdup(string);
-}
-
-void removeTagItemString(int type mpd_unused, char *string)
-{
-	free(string);
-}
-
 static int visit_tag_items(int fd mpd_unused, Song *song, void *data)
 {
 	enum tag_type type = (enum tag_type)(size_t)data;
diff --git a/src/tagTracker.h b/src/tagTracker.h
index 84506426e..2edb5aad0 100644
--- a/src/tagTracker.h
+++ b/src/tagTracker.h
@@ -19,10 +19,6 @@
 #ifndef TAG_TRACKER_H
 #define TAG_TRACKER_H
 
-char *getTagItemString(int type, char *string);
-
-void removeTagItemString(int type, char *string);
-
 int getNumberOfTagItems(int type);
 
 void printMemorySavedByTagTracker(void);