From 63011c67438204ccdb29322b6f324c17e20fc0e1 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Sun, 18 Jul 2010 12:42:47 +0000
Subject: [PATCH] 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
---
 apps/plugins/imageviewer/png/png.c        | 2 +-
 apps/plugins/mpegplayer/alloc.c           | 4 ++--
 apps/plugins/mpegplayer/disk_buf.c        | 4 ++--
 apps/plugins/shortcuts/shortcuts_common.c | 2 +-
 firmware/common/format.c                  | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/plugins/imageviewer/png/png.c b/apps/plugins/imageviewer/png/png.c
index c398af70c5..8bd1b241f3 100644
--- a/apps/plugins/imageviewer/png/png.c
+++ b/apps/plugins/imageviewer/png/png.c
@@ -1359,7 +1359,7 @@ int load_image(char *filename, struct image_info *info,
 
     } else {
         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_update();
         }
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,
 {
     void *x;
 
-    DEBUGF("mpeg_alloc_internal: bs:%zu s:%u reason:%s (%d)\n",
-           bufsize, size, mpeg_get_reason_str(reason), reason);
+    DEBUGF("mpeg_alloc_internal: bs:%lu s:%u reason:%s (%d)\n",
+           (unsigned long)bufsize, size, mpeg_get_reason_str(reason), reason);
 
     if ((size_t) (*mem_ptr + size) > bufsize)
     {
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)
     else if (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);
     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);
 
diff --git a/apps/plugins/shortcuts/shortcuts_common.c b/apps/plugins/shortcuts/shortcuts_common.c
index 0eb8c47e7d..fe4f07798b 100644
--- a/apps/plugins/shortcuts/shortcuts_common.c
+++ b/apps/plugins/shortcuts/shortcuts_common.c
@@ -54,7 +54,7 @@ void write_int_instruction_to_file(int fd, char *instr, int value);
 void allocate_memory(void **buf, size_t *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);
 }
 
 
diff --git a/firmware/common/format.c b/firmware/common/format.c
index 8b9556605f..987af417da 100644
--- a/firmware/common/format.c
+++ b/firmware/common/format.c
@@ -122,7 +122,6 @@ int format(
             break;
 
         case 'l':
-        case 'z': /* assume sizeof(size_t) == sizeof(long) */
             ch = *fmt++;
             switch(ch) {
                 case 'x':