Migrate away from wchar_t, default to utf8

1 files changed, 4 insertions, 13 deletions

diff --git a/src/tag.c b/src/tag.c
index 2415dec..aa4a266 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1,11 +1,13 @@
 #include "tag.h"
+
 #include "link.h"
 #include "ref.h"
+#include "util.h"
 
 #include <string.h>
 
 struct tag *
-tag_init(const char *path, const char *fname)
+tag_alloc(const char *path, const char *fname)
 {
 	struct tag *tag;
 	int len;
@@ -13,19 +15,11 @@ tag_init(const char *path, const char *fname)
 	tag = malloc(sizeof(struct tag));
 	ASSERT(tag != NULL);
 
-	tag->fname = strdup(fname);
-	ASSERT(tag->fname != NULL);
-
-	tag->new_fname = NULL;
-
 	tag->fpath = aprintf("%s/%s", path, fname);
 	ASSERT(tag->fpath != NULL);
 
-	len = mbstowcs(NULL, tag->fname, 0);
-	ASSERT(len > 0);
-	tag->name = calloc(len + 1, sizeof(wchar_t));
+	tag->name = strdup(fname);
 	ASSERT(tag->name != NULL);
-	mbstowcs(tag->name, tag->fname, len + 1);
 
 	tag->link = LINK_EMPTY;
 
@@ -37,11 +31,8 @@ tag_init(const char *path, const char *fname)
 void
 tag_free(struct tag *tag)
 {
-	free(tag->fname);
 	free(tag->fpath);
 	free(tag->name);
-
 	refs_free(&tag->tracks);
-
 	free(tag);
 }