len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the type of read_uint32be to uint32_t and ensure all variables passed to that function are also of that type. No functional changes, but makes read_uint32be consistent with the other read_* functions and prevents warning in the upcoming RealAudio metadata parser.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20950 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2009-05-15 22:45:03 +00:00
parent a96ce3ba52
commit da3dc455f6
3 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/metadata/metadata_common.c
View file

@ -99,7 +99,7 @@ long read_string(int fd, char* buf, long buf_size, int eos, long size)
#ifdef ROCKBOX_LITTLE_ENDIAN #ifdef ROCKBOX_LITTLE_ENDIAN
/* Read an unsigned 32-bit integer from a big-endian file. */ /* Read an unsigned 32-bit integer from a big-endian file. */
int read_uint32be(int fd, unsigned int* buf) int read_uint32be(int fd, uint32_t* buf)
{ {
size_t n; size_t n;

2
apps/metadata/metadata_common.h
View file

@ -44,7 +44,7 @@ int read_uint16le(int fd, uint16_t* buf);
int read_uint32le(int fd, uint32_t* buf); int read_uint32le(int fd, uint32_t* buf);
int read_uint64le(int fd, uint64_t* buf); int read_uint64le(int fd, uint64_t* buf);
#else #else
int read_uint32be(int fd, unsigned int* buf); int read_uint32be(int fd, uint32_t* buf);
#define read_uint16le(fd,buf) read((fd), (buf), 2) #define read_uint16le(fd,buf) read((fd), (buf), 2)
#define read_uint32le(fd,buf) read((fd), (buf), 4) #define read_uint32le(fd,buf) read((fd), (buf), 4)
#define read_uint64le(fd,buf) read((fd), (buf), 8) #define read_uint64le(fd,buf) read((fd), (buf), 8)

39
apps/metadata/mp4.c
View file

@ -130,8 +130,8 @@ static unsigned int read_mp4_tag_string(int fd, int size_left, char** buffer,
return length; return length;
} }
static unsigned int read_mp4_atom(int fd, unsigned int* size, static unsigned int read_mp4_atom(int fd, uint32_t* size,
unsigned int* type, unsigned int size_left) uint32_t* type, uint32_t size_left)
{ {
read_uint32be(fd, size); read_uint32be(fd, size);
read_uint32be(fd, type); read_uint32be(fd, type);
@ -168,7 +168,7 @@ static unsigned int read_mp4_atom(int fd, unsigned int* size,
return size_left; return size_left;
} }
static unsigned int read_mp4_length(int fd, unsigned int* size) static unsigned int read_mp4_length(int fd, uint32_t* size)
{ {
unsigned int length = 0; unsigned int length = 0;
int bytes = 0; int bytes = 0;
@ -186,8 +186,7 @@ static unsigned int read_mp4_length(int fd, unsigned int* size)
return length; return length;
} }
static bool read_mp4_esds(int fd, struct mp3entry* id3, static bool read_mp4_esds(int fd, struct mp3entry* id3, uint32_t* size)
unsigned int* size)
{ {
unsigned char buf[8]; unsigned char buf[8];
bool sbr = false; bool sbr = false;
@ -349,10 +348,10 @@ static bool read_mp4_esds(int fd, struct mp3entry* id3,
} }
static bool read_mp4_tags(int fd, struct mp3entry* id3, static bool read_mp4_tags(int fd, struct mp3entry* id3,
unsigned int size_left) uint32_t size_left)
{ {
unsigned int size; uint32_t size;
unsigned int type; uint32_t type;
unsigned int buffer_left = sizeof(id3->id3v2buf) + sizeof(id3->id3v1buf); unsigned int buffer_left = sizeof(id3->id3v2buf) + sizeof(id3->id3v1buf);
char* buffer = id3->id3v2buf; char* buffer = id3->id3v2buf;
bool cwrt = false; bool cwrt = false;
@ -456,7 +455,7 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
case MP4_extra: case MP4_extra:
{ {
char tag_name[TAG_NAME_LENGTH]; char tag_name[TAG_NAME_LENGTH];
unsigned int sub_size; uint32_t sub_size;
/* "mean" atom */ /* "mean" atom */
read_uint32be(fd, &sub_size); read_uint32be(fd, &sub_size);
@ -543,11 +542,11 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
} }
static bool read_mp4_container(int fd, struct mp3entry* id3, static bool read_mp4_container(int fd, struct mp3entry* id3,
unsigned int size_left) uint32_t size_left)
{ {
unsigned int size; uint32_t size;
unsigned int type; uint32_t type;
unsigned int handler = 0; uint32_t handler = 0;
bool rc = true; bool rc = true;
do do
@ -562,7 +561,7 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
{ {
case MP4_ftyp: case MP4_ftyp:
{ {
unsigned int id; uint32_t id;
read_uint32be(fd, &id); read_uint32be(fd, &id);
size -= 4; size -= 4;
@ -625,7 +624,7 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
case MP4_stts: case MP4_stts:
{ {
unsigned int entries; uint32_t entries;
unsigned int i; unsigned int i;
lseek(fd, 4, SEEK_CUR); lseek(fd, 4, SEEK_CUR);
@ -634,8 +633,8 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
for (i = 0; i < entries; i++) for (i = 0; i < entries; i++)
{ {
unsigned int n; uint32_t n;
unsigned int l; uint32_t l;
read_uint32be(fd, &n); read_uint32be(fd, &n);
read_uint32be(fd, &l); read_uint32be(fd, &l);
@ -649,7 +648,7 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
case MP4_mp4a: case MP4_mp4a:
case MP4_alac: case MP4_alac:
{ {
unsigned int frequency; uint32_t frequency;
id3->codectype = (type == MP4_mp4a) ? AFMT_AAC : AFMT_ALAC; id3->codectype = (type == MP4_mp4a) ? AFMT_AAC : AFMT_ALAC;
lseek(fd, 22, SEEK_CUR); lseek(fd, 22, SEEK_CUR);
@ -659,8 +658,8 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
if (type == MP4_mp4a) if (type == MP4_mp4a)
{ {
unsigned int subsize; uint32_t subsize;
unsigned int subtype; uint32_t subtype;
/* Get frequency from the decoder info tag, if possible. */ /* Get frequency from the decoder info tag, if possible. */
lseek(fd, 2, SEEK_CUR); lseek(fd, 2, SEEK_CUR);