oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag_id3: use GLib instead of utils.h

Browse Source
This commit is contained in:
Max Kellermann 2009-01-03 14:51:41 +01:00
parent c24a102c98
commit 30f75f7f01
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tag_id3.c
View File

@ -18,12 +18,15 @@
#include "tag_id3.h" #include "tag_id3.h"
#include "tag.h" #include "tag.h"
#include "utils.h"
#include "conf.h" #include "conf.h"
#include <glib.h> #include <glib.h>
#include <id3tag.h> #include <id3tag.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "id3" #define G_LOG_DOMAIN "id3"
@ -66,10 +69,10 @@ static id3_utf8_t * processID3FieldString (int is_id3v1, const id3_ucs4_t *ucs4,
g_debug("Unable to convert %s string to UTF-8: '%s'", g_debug("Unable to convert %s string to UTF-8: '%s'",
encoding, isostr); encoding, isostr);
g_error_free(error); g_error_free(error);
free(isostr); g_free(isostr);
return NULL; return NULL;
} }
free(isostr); g_free(isostr);
} else { } else {
utf8 = id3_ucs4_utf8duplicate(ucs4); utf8 = id3_ucs4_utf8duplicate(ucs4);
if (G_UNLIKELY(!utf8)) { if (G_UNLIKELY(!utf8)) {
@ -78,7 +81,7 @@ static id3_utf8_t * processID3FieldString (int is_id3v1, const id3_ucs4_t *ucs4,
} }
utf8_stripped = (id3_utf8_t *)g_strdup(g_strstrip((gchar *)utf8)); utf8_stripped = (id3_utf8_t *)g_strdup(g_strstrip((gchar *)utf8));
free(utf8); g_free(utf8);
return utf8_stripped; return utf8_stripped;
} }
@ -147,7 +150,7 @@ static struct tag *getID3Info(
if (mpdTag == NULL) if (mpdTag == NULL)
mpdTag = tag_new(); mpdTag = tag_new();
tag_add_item(mpdTag, type, (char *)utf8); tag_add_item(mpdTag, type, (char *)utf8);
free(utf8); g_free(utf8);
} }
} }
else { else {
@ -180,7 +183,7 @@ static struct tag *getID3Info(
if (mpdTag == NULL) if (mpdTag == NULL)
mpdTag = tag_new(); mpdTag = tag_new();
tag_add_item(mpdTag, type, (char *)utf8); tag_add_item(mpdTag, type, (char *)utf8);
free(utf8); g_free(utf8);
} }
} }
} }
@ -259,18 +262,18 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
if (tagSize <= 0) return NULL; if (tagSize <= 0) return NULL;
/* Found a tag. Allocate a buffer and read it in. */ /* Found a tag. Allocate a buffer and read it in. */
tagBuf = xmalloc(tagSize); tagBuf = g_malloc(tagSize);
if (!tagBuf) return NULL; if (!tagBuf) return NULL;
tagBufSize = fillBuffer(tagBuf, tagSize, stream, offset, whence); tagBufSize = fillBuffer(tagBuf, tagSize, stream, offset, whence);
if (tagBufSize < tagSize) { if (tagBufSize < tagSize) {
free(tagBuf); g_free(tagBuf);
return NULL; return NULL;
} }
tag = id3_tag_parse(tagBuf, tagBufSize); tag = id3_tag_parse(tagBuf, tagBufSize);
free(tagBuf); g_free(tagBuf);
return tag; return tag;
} }