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

Revert accidental commit of "%z" support in r26071 (the implementation assumed size_t==long, which is not always the case in hosted environments)

Browse source 
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
This commit is contained in:
Frank Gevaerts 2010-07-18 12:42:47 +00:00
parent 3cd1968cbc
commit 63011c6743
5 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/imageviewer/png/png.c
View file

@ -1359,7 +1359,7 @@ int load_image(char *filename, struct image_info *info,
} else { } else {
if (!running_slideshow) { if (!running_slideshow) {
rb->snprintf(print, sizeof(print), "loading %zu bytes", image_size); rb->snprintf(print, sizeof(print), "loading %lu bytes", (unsigned long)image_size);
rb->lcd_puts(0, 1, print); rb->lcd_puts(0, 1, print);
rb->lcd_update(); rb->lcd_update();
} }

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

@ -96,8 +96,8 @@ static void * mpeg_malloc_internal (unsigned char *mallocbuf,
{ {
void *x; void *x;
DEBUGF("mpeg_alloc_internal: bs:%zu s:%u reason:%s (%d)\n", DEBUGF("mpeg_alloc_internal: bs:%lu s:%u reason:%s (%d)\n",
bufsize, size, mpeg_get_reason_str(reason), reason); (unsigned long)bufsize, size, mpeg_get_reason_str(reason), reason);
if ((size_t) (*mem_ptr + size) > bufsize) if ((size_t) (*mem_ptr + size) > bufsize)
{ {

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

@ -786,12 +786,12 @@ ssize_t disk_buf_prepare_streaming(off_t pos, size_t len)
else if (pos > disk_buf.filesize) else if (pos > disk_buf.filesize)
pos = disk_buf.filesize; pos = disk_buf.filesize;
DEBUGF("prepare streaming:\n pos:%ld len:%zu\n", pos, len); DEBUGF("prepare streaming:\n pos:%ld len:%lu\n", pos, (unsigned long)len);
pos = disk_buf_lseek(pos, SEEK_SET); pos = disk_buf_lseek(pos, SEEK_SET);
len = disk_buf_probe(pos, len, NULL); len = disk_buf_probe(pos, len, NULL);
DEBUGF(" probe done: pos:%ld len:%zu\n", pos, len); DEBUGF(" probe done: pos:%ld len:%lu\n", pos, (unsigned long)len);
len = disk_buf_send_msg(STREAM_RESET, pos); len = disk_buf_send_msg(STREAM_RESET, pos);

2
apps/plugins/shortcuts/shortcuts_common.c
View file

@ -54,7 +54,7 @@ void write_int_instruction_to_file(int fd, char *instr, int value);
void allocate_memory(void **buf, size_t *bufsize) void allocate_memory(void **buf, size_t *bufsize)
{ {
*buf = rb->plugin_get_buffer(bufsize); *buf = rb->plugin_get_buffer(bufsize);
DEBUGF("Got %zud bytes of memory\n", *bufsize); DEBUGF("Got %lu bytes of memory\n", (unsigned long)*bufsize);
} }

1
firmware/common/format.c
View file

@ -122,7 +122,6 @@ int format(
break; break;
case 'l': case 'l':
case 'z': /* assume sizeof(size_t) == sizeof(long) */
ch = *fmt++; ch = *fmt++;
switch(ch) { switch(ch) {
case 'x': case 'x':