1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-10 09:01:13 +02:00

lib-src/libid3tag: remove warnings...

... with casts between char* and unsigned char*
This commit is contained in:
Paul Licameli 2018-11-13 08:59:25 -05:00
parent 73452e96ee
commit cd4fa7bdb0
3 changed files with 11 additions and 11 deletions

View File

@ -280,7 +280,7 @@ struct id3_frame *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 const *)id, 3);
*ptr += 3;
size = id3_parse_uint(ptr, 3);
@ -296,7 +296,7 @@ struct id3_frame *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 const *)id, 4);
*ptr += 4;
size = id3_parse_uint(ptr, 4);
@ -308,7 +308,7 @@ struct id3_frame *id3_frame_parse(id3_byte_t const **ptr, id3_length_t length,
end = *ptr + size;
if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~0x00e0)) {
frame = unparseable(id, ptr, end - *ptr, 0, 0, 0, 0);
frame = unparseable((char const *)id, ptr, end - *ptr, 0, 0, 0, 0);
goto done;
}
@ -348,14 +348,14 @@ struct id3_frame *id3_frame_parse(id3_byte_t const **ptr, id3_length_t length,
/* canonicalize frame ID for ID3v2.4 */
if (compat && compat->equiv)
id = compat->equiv;
id = (id3_byte_t const *)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 const *)xid;
flags |=
ID3_FRAME_FLAG_TAGALTERPRESERVATION |
@ -376,7 +376,7 @@ struct id3_frame *id3_frame_parse(id3_byte_t const **ptr, id3_length_t length,
end = *ptr + size;
if (flags & (ID3_FRAME_FLAG_FORMATFLAGS & ~ID3_FRAME_FLAG_KNOWNFLAGS)) {
frame = unparseable(id, ptr, end - *ptr, flags, 0, 0, 0);
frame = unparseable((char const *)id, ptr, end - *ptr, flags, 0, 0, 0);
goto done;
}
@ -423,7 +423,7 @@ struct id3_frame *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 const *)id, &data, end - data, flags,
group_id, encryption_method, decoded_length);
goto done;
}
@ -445,13 +445,13 @@ struct id3_frame *id3_frame_parse(id3_byte_t const **ptr, id3_length_t length,
/* check for obsolescence */
if (compat && !compat->equiv) {
frame = obsolete(id, data, end - data);
frame = obsolete((char const *)id, data, end - data);
goto done;
}
/* generate the internal frame structure */
frame = id3_frame_new(id);
frame = id3_frame_new((char const *)id);
if (frame) {
frame->flags = flags;
frame->group_id = group_id;

View File

@ -116,7 +116,7 @@ id3_length_t id3_render_latin1(id3_byte_t **ptr,
id3_length_t size;
if (latin1 == 0)
latin1 = "";
latin1 = (id3_latin1_t const *)"";
size = id3_latin1_size(latin1);
if (!terminate)

View File

@ -351,7 +351,7 @@ int v1_attachstr(struct id3_tag *tag, char const *id,
goto fail;
if (text)
id3_latin1_decode(text, ucs4);
id3_latin1_decode((id3_latin1_t const *)text, ucs4);
else
id3_ucs4_putnumber(ucs4, number);