diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-07-18 12:42:47 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-07-18 12:42:47 +0000 |
commit | 63011c67438204ccdb29322b6f324c17e20fc0e1 (patch) | |
tree | 21b39ce39e22ba0cc666c80d48294b3e85f4f56e /apps/plugins/mpegplayer | |
parent | 3cd1968cbc30d32b6d883792c841c897c872860a (diff) | |
download | rockbox-63011c67438204ccdb29322b6f324c17e20fc0e1.tar.gz rockbox-63011c67438204ccdb29322b6f324c17e20fc0e1.zip |
Revert accidental commit of "%z" support in r26071 (the implementation assumed size_t==long, which is not always the case in hosted environments)
Remove four remaining uses of %z, three of which were in DEBUGF
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27479 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r-- | apps/plugins/mpegplayer/alloc.c | 4 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/disk_buf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c index e5c79c4b0c..c2165b2ea9 100644 --- a/apps/plugins/mpegplayer/alloc.c +++ b/apps/plugins/mpegplayer/alloc.c | |||
@@ -96,8 +96,8 @@ static void * mpeg_malloc_internal (unsigned char *mallocbuf, | |||
96 | { | 96 | { |
97 | void *x; | 97 | void *x; |
98 | 98 | ||
99 | DEBUGF("mpeg_alloc_internal: bs:%zu s:%u reason:%s (%d)\n", | 99 | DEBUGF("mpeg_alloc_internal: bs:%lu s:%u reason:%s (%d)\n", |
100 | bufsize, size, mpeg_get_reason_str(reason), reason); | 100 | (unsigned long)bufsize, size, mpeg_get_reason_str(reason), reason); |
101 | 101 | ||
102 | if ((size_t) (*mem_ptr + size) > bufsize) | 102 | if ((size_t) (*mem_ptr + size) > bufsize) |
103 | { | 103 | { |
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c index 4d0f98e5a3..b78407b9db 100644 --- a/apps/plugins/mpegplayer/disk_buf.c +++ b/apps/plugins/mpegplayer/disk_buf.c | |||
@@ -786,12 +786,12 @@ ssize_t disk_buf_prepare_streaming(off_t pos, size_t len) | |||
786 | else if (pos > disk_buf.filesize) | 786 | else if (pos > disk_buf.filesize) |
787 | pos = disk_buf.filesize; | 787 | pos = disk_buf.filesize; |
788 | 788 | ||
789 | DEBUGF("prepare streaming:\n pos:%ld len:%zu\n", pos, len); | 789 | DEBUGF("prepare streaming:\n pos:%ld len:%lu\n", pos, (unsigned long)len); |
790 | 790 | ||
791 | pos = disk_buf_lseek(pos, SEEK_SET); | 791 | pos = disk_buf_lseek(pos, SEEK_SET); |
792 | len = disk_buf_probe(pos, len, NULL); | 792 | len = disk_buf_probe(pos, len, NULL); |
793 | 793 | ||
794 | DEBUGF(" probe done: pos:%ld len:%zu\n", pos, len); | 794 | DEBUGF(" probe done: pos:%ld len:%lu\n", pos, (unsigned long)len); |
795 | 795 | ||
796 | len = disk_buf_send_msg(STREAM_RESET, pos); | 796 | len = disk_buf_send_msg(STREAM_RESET, pos); |
797 | 797 | ||