diff options
Diffstat (limited to 'libid3tag/frame.c')
-rw-r--r-- | libid3tag/frame.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libid3tag/frame.c b/libid3tag/frame.c index bf4e7a4..21f987a 100644 --- a/libid3tag/frame.c +++ b/libid3tag/frame.c @@ -274,11 +274,8 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, unsigned int version) { struct id3_frame *frame = 0; - id3_byte_t const *id, - *end, - *data; - id3_length_t size, - decoded_length = 0; + id3_byte_t const *id, *end, *data; + id3_length_t size, decoded_length = 0; int flags = 0, group_id = 0, encryption_method = 0; @@ -295,7 +292,7 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, if (length < 6) goto fail; - compat = id3_compat_lookup(id, 3); + compat = id3_compat_lookup((char*)id, 3); *ptr += 3; size = id3_parse_uint(ptr, 3); @@ -311,7 +308,7 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, if (length < 10) goto fail; - compat = id3_compat_lookup(id, 4); + compat = id3_compat_lookup((char*)id, 4); *ptr += 4; size = id3_parse_uint(ptr, 4); @@ -324,8 +321,9 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~0x00e0)) { frame = - unparseable(id, ptr, end - *ptr, 0, 0, - 0, 0); + unparseable((char*)id, ptr, + end - *ptr, 0, 0, + 0, 0); goto done; } @@ -368,14 +366,14 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, */ if (compat && compat->equiv) - id = compat->equiv; + id = (id3_byte_t*) compat->equiv; else if (ID3_TAG_VERSION_MAJOR(version) == 2) { xid[0] = 'Y'; xid[1] = id[0]; xid[2] = id[1]; xid[3] = id[2]; - id = xid; + id = (id3_byte_t*) xid; flags |= ID3_FRAME_FLAG_TAGALTERPRESERVATION | @@ -398,7 +396,8 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, (ID3_FRAME_FLAG_FORMATFLAGS & ~ID3_FRAME_FLAG_KNOWNFLAGS)) { frame = - unparseable(id, ptr, end - *ptr, flags, 0, 0, + unparseable((char*) id, + ptr, end - *ptr, flags, 0, 0, 0); goto done; } @@ -448,7 +447,8 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, } if (flags & ID3_FRAME_FLAG_ENCRYPTION) { - frame = unparseable(id, &data, end - data, flags, + frame = unparseable((char*) id, + &data, end - data, flags, group_id, encryption_method, decoded_length); goto done; @@ -474,7 +474,7 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, */ if (compat && !compat->equiv) { - frame = obsolete(id, data, end - data); + frame = obsolete((char*) id, data, end - data); goto done; } @@ -482,7 +482,7 @@ id3_frame_parse(id3_byte_t const **ptr, id3_length_t length, * generate the internal frame structure */ - frame = id3_frame_new(id); + frame = id3_frame_new((char*) id); if (frame) { frame->flags = flags; frame->group_id = group_id; |