devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Eliminate %zd tag in printf format strings, replace them with %ld. The %z formatter kept generating type mismatch warnings.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26040 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jeffrey Goode 2010-05-15 03:34:31 +00:00
parent ff548fad86
commit 6ef04a7f0e
5 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/buffering.c
View file

@ -685,8 +685,8 @@ static bool buffer_handle(int handle_id)
/* stop buffering data for now and post-pone buffering the rest */ /* stop buffering data for now and post-pone buffering the rest */
stop = true; stop = true;
DEBUGF( "%s(): Preventing handle corruption: h1.id:%d h2.id:%d" DEBUGF( "%s(): Preventing handle corruption: h1.id:%d h2.id:%d"
" copy_n:%lu overlap:%zd h1.filerem:%lu\n", __func__, " copy_n:%lu overlap:%ld h1.filerem:%lu\n", __func__,
h->id, h->next->id, (unsigned long)copy_n, overlap, h->id, h->next->id, (unsigned long)copy_n, (long)overlap,
(unsigned long)h->filerem); (unsigned long)h->filerem);
copy_n -= overlap; copy_n -= overlap;
} }

4
apps/plugins/mpegplayer/audio_thread.c
View file

@ -279,8 +279,8 @@ static int audio_sync(struct audio_thread_data *td,
{ {
if (audio_buffer(str, STREAM_PM_RANDOM_ACCESS) == STREAM_DATA_END) if (audio_buffer(str, STREAM_PM_RANDOM_ACCESS) == STREAM_DATA_END)
{ {
DEBUGF("audio_sync:STR_DATA_END\n aqu:%zd swl:%ld swr:%ld\n", DEBUGF("audio_sync:STR_DATA_END\n aqu:%ld swl:%ld swr:%ld\n",
audio_queue.used, str->hdr.win_left, str->hdr.win_right); (long)audio_queue.used, str->hdr.win_left, str->hdr.win_right);
if (audio_queue.used <= MAD_BUFFER_GUARD) if (audio_queue.used <= MAD_BUFFER_GUARD)
goto sync_data_end; goto sync_data_end;
} }

4
apps/plugins/mpegplayer/disk_buf.c
View file

@ -881,8 +881,8 @@ bool disk_buf_init(void)
DEBUGF("disk_buf info:\n" DEBUGF("disk_buf info:\n"
" page count: %d\n" " page count: %d\n"
" size: %zd\n", " size: %ld\n",
disk_buf.pgcount, disk_buf.size); disk_buf.pgcount, (long)disk_buf.size);
rb->memset(disk_buf.cache, 0xff, rb->memset(disk_buf.cache, 0xff,
disk_buf.pgcount*sizeof (*disk_buf.cache)); disk_buf.pgcount*sizeof (*disk_buf.cache));

32
apps/plugins/mpegplayer/mpeg_parser.c
View file

@ -366,9 +366,9 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
pos = pos_new; pos = pos_new;
DEBUGF("Seeking stream 0x%02x\n", id); DEBUGF("Seeking stream 0x%02x\n", id);
DEBUGF("$$ tl:%u t:%u ct:?? tr:%u\n pl:%zd pn:%zd pr:%zd\n", DEBUGF("$$ tl:%u t:%u ct:?? tr:%u\n pl:%ld pn:%ld pr:%ld\n",
(unsigned)time_left, (unsigned)time, (unsigned)time_right, (unsigned)time_left, (unsigned)time, (unsigned)time_right,
pos_left, pos_new, pos_right); (long)pos_left, (long)pos_new, (long)pos_right);
sk.dir = SSCAN_REVERSE; sk.dir = SSCAN_REVERSE;
@ -425,9 +425,10 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
state = STATE2; /* Last scan was early */ state = STATE2; /* Last scan was early */
sk.dir = SSCAN_REVERSE; sk.dir = SSCAN_REVERSE;
DEBUGF(">> tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n", DEBUGF(">> tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
(unsigned)time_left, (unsigned)time, (unsigned)currpts, (unsigned)time_left, (unsigned)time, (unsigned)currpts,
(unsigned)time_right, pos_left, pos_new, pos_right); (unsigned)time_right, (long)pos_left, (long)pos_new,
(long)pos_right);
} }
else if (currpts > time) else if (currpts > time)
{ {
@ -453,16 +454,18 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
state = STATE3; /* Last scan was late */ state = STATE3; /* Last scan was late */
sk.dir = SSCAN_REVERSE; sk.dir = SSCAN_REVERSE;
DEBUGF("<< tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n", DEBUGF("<< tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
(unsigned)time_left, (unsigned)time, (unsigned)currpts, (unsigned)time_left, (unsigned)time, (unsigned)currpts,
(unsigned)time_right, pos_left, pos_new, pos_right); (unsigned)time_right, (long)pos_left, (long)pos_new,
pos_right);
} }
else else
{ {
/* Exact match - it happens */ /* Exact match - it happens */
DEBUGF("|| tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n", DEBUGF("|| tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
(unsigned)time_left, (unsigned)time, (unsigned)currpts, (unsigned)time_left, (unsigned)time, (unsigned)currpts,
(unsigned)time_right, pos_left, pos_new, pos_right); (unsigned)time_right, (long)pos_left, (long)pos_new,
(long)pos_right);
pts = currpts; pts = currpts;
pos = sk.pos; pos = sk.pos;
state = STATE9; state = STATE9;
@ -492,9 +495,10 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
* will find it. */ * will find it. */
pos_new = pos_left; pos_new = pos_left;
sk.dir = SSCAN_FORWARD; sk.dir = SSCAN_FORWARD;
DEBUGF("?? tl:%u t:%u ct:%u tr:%u\n pl:%zd pn:%zd pr:%zd\n", DEBUGF("?? tl:%u t:%u ct:%u tr:%u\n pl:%ld pn:%ld pr:%ld\n",
(unsigned)time_left, (unsigned)time, (unsigned)currpts, (unsigned)time_left, (unsigned)time, (unsigned)currpts,
(unsigned)time_right, pos_left, pos_new, pos_right); (unsigned)time_right, (long)pos_left, (long)pos_new,
(long)pos_right);
state = STATE1; state = STATE1;
break; break;
default: default:
@ -521,8 +525,8 @@ static off_t mpeg_parser_seek_PTS(uint32_t time, unsigned id)
sk.dir = SSCAN_FORWARD; sk.dir = SSCAN_FORWARD;
uint32_t nextpts = mpeg_parser_scan_pts(&sk, id); uint32_t nextpts = mpeg_parser_scan_pts(&sk, id);
DEBUGF("Seek pos:%zd pts:%u t:%u next pts:%u \n", DEBUGF("Seek pos:%ld pts:%u t:%u next pts:%u \n",
pos, (unsigned)pts, (unsigned)time, (unsigned)nextpts); (long)pos, (unsigned)pts, (unsigned)time, (unsigned)nextpts);
if (pts <= time && time < nextpts) if (pts <= time && time < nextpts)
{ {
@ -608,8 +612,8 @@ try_again:
str_parser.parms.sd.sk.len = 1024*1024; str_parser.parms.sd.sk.len = 1024*1024;
str_parser.parms.sd.sk.dir = SSCAN_FORWARD; str_parser.parms.sd.sk.dir = SSCAN_FORWARD;
DEBUGF("thumb pos:%ld len:%zd\n", str_parser.parms.sd.sk.pos, DEBUGF("thumb pos:%ld len:%ld\n", str_parser.parms.sd.sk.pos,
str_parser.parms.sd.sk.len); (long)str_parser.parms.sd.sk.len);
result = str_send_msg(&video_str, STREAM_SYNC, result = str_send_msg(&video_str, STREAM_SYNC,
(intptr_t)&str_parser.parms.sd); (intptr_t)&str_parser.parms.sd);

2
apps/plugins/mpegplayer/pcm_output.c
View file

@ -99,7 +99,7 @@ static void get_more(unsigned char **start, size_t *size)
/* Just show a warning about this - will never happen /* Just show a warning about this - will never happen
* without a bug in the audio thread code or a clobbered * without a bug in the audio thread code or a clobbered
* buffer */ * buffer */
DEBUGF("get_more: invalid size (%zd)\n", sz); DEBUGF("get_more: invalid size (%ld)\n", (long)sz);
} }
if (offset < -100*CLOCK_RATE/1000) if (offset < -100*CLOCK_RATE/1000)