aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2006-08-03 04:34:51 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2006-08-03 04:34:51 +0000
commitc0036bcb4505e8aee217fa6c09c3c78826bd9ee4 (patch)
treef45c4bbf0d2ac2856a09a4e9ab5cc0d1437fe3a3
parent055e166619b1f8302b612b9ea69e39ccb876de72 (diff)
downloadmpd-c0036bcb4505e8aee217fa6c09c3c78826bd9ee4.tar.gz
mpd-c0036bcb4505e8aee217fa6c09c3c78826bd9ee4.tar.xz
mpd-c0036bcb4505e8aee217fa6c09c3c78826bd9ee4.zip
Our id3 tag buffer should be an array of bytes, not an array of pointers to bytes. Now I know where those warnings came from...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4540 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/tag.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tag.c b/src/tag.c
index c847ceaea..62c04893a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -233,7 +233,7 @@ static int getId3v2FooterSize(FILE * stream, long offset, int whence)
static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
{
struct id3_tag *tag;
- id3_byte_t *buf[ID3_TAG_BUFLEN];
+ id3_byte_t buf[ID3_TAG_BUFLEN];
id3_byte_t *mbuf;
int tagsize;
int bufsize;
@@ -244,12 +244,12 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
if (bufsize <= 0) return NULL;
/* Look for a tag header */
- tagsize = id3_tag_query((const id3_byte_t *)buf, bufsize);
+ tagsize = id3_tag_query(buf, bufsize);
if (tagsize <= 0) return NULL;
if (tagsize <= bufsize) {
/* Got an id3 tag, and it fits in buf */
- tag = id3_tag_parse((const id3_byte_t *)buf, tagsize);
+ tag = id3_tag_parse(buf, tagsize);
} else {
/* Got an id3tag that overflows buf, so get a new one */
mbuf = malloc(tagsize);
@@ -261,7 +261,7 @@ static struct id3_tag *getId3Tag(FILE * stream, long offset, int whence)
return NULL;
}
- tag = id3_tag_parse((const id3_byte_t *)mbuf, tagsize);
+ tag = id3_tag_parse(mbuf, tagsize);
free(mbuf);
}