22 files changed, 32 insertions, 32 deletions

diff --git a/apps/onplay.c b/apps/onplay.c
index 2912fc3fe0..c10d110350 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -604,7 +604,7 @@ static bool clipboard_pastefile(const char *src, const char *target, bool copy)
 
     if (copy) {
         /* See if we can get the plugin buffer for the file copy buffer */
-        buffer = (char *) plugin_get_buffer(&buffersize);
+        buffer = (char *) plugin_get_buffer((size_t *)&buffersize);
         if (buffer == NULL || buffersize < 512) {
             /* Not large enough, try for a disk sector worth of stack instead */
             buffersize = 512;
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 78ec23105c..25a78e750a 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -283,7 +283,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
         /* Nothing is playing, exit */
         return false;
 
-    buffer = plugin_get_buffer(&buffer_size);
+    buffer = plugin_get_buffer((size_t *)&buffer_size);
     if (!buffer)
         return false;
 
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index 08689d661f..8b285d413a 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -1157,7 +1157,7 @@ int main(void* parameter)
 #endif
 
     /* init the worker thread */
-    stack = rb->plugin_get_buffer(&stacksize); /* use the rest as stack */
+    stack = rb->plugin_get_buffer((size_t *)&stacksize); /* use the rest as stack */
     stack = (void*)(((unsigned int)stack + 100) & ~3); /* a bit away, 32 bit align */
     stacksize = (stacksize - 100) & ~3;
     if (stacksize < DEFAULT_STACK_SIZE)
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 4c12fa7506..172b8bb39b 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -84,7 +84,7 @@ void *pl_malloc(ssize_t size)
 /* init function for pl_malloc() */
 void pl_malloc_init(void)
 {
-    bufptr = rb->plugin_get_buffer(&bufleft);
+    bufptr = rb->plugin_get_buffer((size_t *)&bufleft);
 }
 
 /* for endian problems */
diff --git a/apps/plugins/firmware_flash.c b/apps/plugins/firmware_flash.c
index c1cd3b2fe9..b841be91d2 100644
--- a/apps/plugins/firmware_flash.c
+++ b/apps/plugins/firmware_flash.c
@@ -640,7 +640,7 @@ void DoUserDialog(char* filename)
     char default_filename[32];
     int button;
     int rc; /* generic return code */
-    int memleft;
+    ssize_t memleft;
     tCheckROM result;
     bool is_romless;
 
@@ -687,7 +687,7 @@ void DoUserDialog(char* filename)
     }
 
     /* "allocate" memory */
-    sector = rb->plugin_get_buffer(&memleft);
+    sector = rb->plugin_get_buffer((size_t *)&memleft);
     if (memleft < SEC_SIZE) /* need buffer for a flash sector */
     {
         rb->splash(HZ*3, "Out of memory");
@@ -927,7 +927,7 @@ void DoUserDialog(char* filename)
     }
 
     /* "allocate" memory */
-    sector = rb->plugin_get_buffer(&memleft);
+    sector = rb->plugin_get_buffer((size_t *)&memleft);
     if (memleft < SEC_SIZE) /* need buffer for a flash sector */
     {
         rb->splash(HZ*3, "Out of memory");
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c
index ea89f4270a..f3fbbb45b8 100644
--- a/apps/plugins/iriver_flash.c
+++ b/apps/plugins/iriver_flash.c
@@ -777,7 +777,7 @@ void DoUserDialog(char* filename)
         return ;
     }
     
-    audiobuf = rb->plugin_get_audio_buffer(&audiobuf_size);
+    audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuf_size);
     
     if (rb->strcasestr(filename, "/rockbox.iriver"))
         flash_rockbox(filename, SECT_RAMIMAGE);
diff --git a/apps/plugins/iriverify.c b/apps/plugins/iriverify.c
index 69c52f5480..135cee36bd 100644
--- a/apps/plugins/iriverify.c
+++ b/apps/plugins/iriverify.c
@@ -139,7 +139,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 
     rb = api;
 
-    buf = rb->plugin_get_audio_buffer(&buf_size); /* start munching memory */
+    buf = rb->plugin_get_audio_buffer((size_t *)&buf_size); /* start munching memory */
 
     stringbuffer = buf;
 
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index b52b3bf2ce..f04d704b2e 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -2298,9 +2298,9 @@ void get_pic_list(void)
     tree = rb->tree_get_context();
 
 #if PLUGIN_BUFFER_SIZE >= MIN_MEM
-    file_pt = rb->plugin_get_buffer(&buf_size);
+    file_pt = rb->plugin_get_buffer((size_t *)&buf_size);
 #else
-    file_pt = rb->plugin_get_audio_buffer(&buf_size);
+    file_pt = rb->plugin_get_audio_buffer((size_t *)&buf_size);
 #endif
 
     for(i = 0; i < tree->filesindir; i++)
@@ -3029,8 +3029,8 @@ int load_and_show(char* filename)
                 {
                     case JPEG_ZOOM_IN:
                         plug_buf = false;
-                        buf_images =
-                                rb->plugin_get_audio_buffer(&buf_images_size);
+                        buf_images = rb->plugin_get_audio_buffer(
+                                        (size_t *)&buf_images_size);
                         /*try again this file, now using the audio buffer */
                         return PLUGIN_OTHER;
 #ifdef JPEG_RC_MENU
@@ -3250,13 +3250,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 #if (PLUGIN_BUFFER_SIZE >= MIN_MEM) && !defined(SIMULATOR)
     if(rb->audio_status())
     {
-        buf = rb->plugin_get_buffer(&buf_size) +
+        buf = rb->plugin_get_buffer((size_t *)&buf_size) +
              (entries * sizeof(char**));
         buf_size -= (entries * sizeof(char**));
         plug_buf = true;
     }
     else
-        buf = rb->plugin_get_audio_buffer(&buf_size);
+        buf = rb->plugin_get_audio_buffer((size_t *)&buf_size);
 #else
     buf = rb->plugin_get_audio_buffer(&buf_size) +
                (entries * sizeof(char**));
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c
index 7c2b899634..6abde85fee 100644
--- a/apps/plugins/lib/overlay.c
+++ b/apps/plugins/lib/overlay.c
@@ -78,7 +78,7 @@ enum plugin_status run_overlay(struct plugin_api* rb, void* parameter,
         return PLUGIN_ERROR;
     }
 
-    audiobuf = rb->plugin_get_audio_buffer(&audiobuf_size);
+    audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuf_size);
     if (header.load_addr < audiobuf ||
         header.end_addr > audiobuf + audiobuf_size)
     {
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index 9d114c9f39..0607c1ab3c 100644
--- a/apps/plugins/midi/midiutil.c
+++ b/apps/plugins/midi/midiutil.c
@@ -155,7 +155,7 @@ void *alloc(int size)
 
     if (offset == NULL)
     {
-        offset = rb->plugin_get_audio_buffer(&totalSize);
+        offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
     }
 
     if (size + 4 > totalSize)
@@ -192,7 +192,7 @@ void *alloc(int size)
 
     if (offset == NULL)
     {
-        offset = rb->plugin_get_audio_buffer(&totalSize);
+        offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
     }
 
     if (size + 4 > totalSize)
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 6b3ee92c4e..8720229320 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -1672,7 +1672,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 #endif
 
     buffer_size &= ~(0x7ff);  /* Round buffer down to nearest 2KB */
-    DEBUGF("audiosize=%d, buffer_size=%ld\n",audiosize,buffer_size);
+    DEBUGF("audiosize=%ld, buffer_size=%ld\n",audiosize,buffer_size);
 
     if (!init_mpabuf())
         return PLUGIN_ERROR;
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c
index 2afaf4d56e..7f498f7532 100644
--- a/apps/plugins/random_folder_advance_config.c
+++ b/apps/plugins/random_folder_advance_config.c
@@ -160,7 +160,7 @@ void edit_list(void)
     fd = rb->open(RFA_FILE,O_RDONLY);
     if (fd < 0)
         return;
-    buffer = rb->plugin_get_audio_buffer(&buffer_size);
+    buffer = rb->plugin_get_audio_buffer((size_t *)&buffer_size);
     if (!buffer)
         return;
     rb->read(fd,buffer,buffer_size);
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c
index 86e62eb433..575fb894a5 100644
--- a/apps/plugins/rockbox_flash.c
+++ b/apps/plugins/rockbox_flash.c
@@ -664,7 +664,7 @@ void DoUserDialog(char* filename)
     }
     
     /* "allocate" memory */
-    sector = rb->plugin_get_buffer(&memleft);
+    sector = rb->plugin_get_buffer((size_t *)&memleft);
     if (memleft < SECTORSIZE) /* need buffer for a flash sector */
     {
         rb->splash(HZ*3, "Out of memory");
@@ -867,7 +867,7 @@ void DoUserDialog(char* filename)
     }
     
     /* "allocate" memory */
-    sector = rb->plugin_get_buffer(&memleft);
+    sector = rb->plugin_get_buffer((size_t *)&memleft);
     if (memleft < SECTORSIZE) /* need buffer for a flash sector */
     {
         rb->splash(HZ*3, "Out of memory");
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 54a88b409c..786f54d239 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -333,7 +333,7 @@ int load_all_levels(void)
 
     /* Init the level_cache pointer and
        calculate how many levels that will fit */
-    level_cache = rb->plugin_get_buffer(&size);
+    level_cache = rb->plugin_get_buffer((size_t *)&size);
     max_levels = size / (HEIGHT*WIDTH);
 
     num_levels = 0;
diff --git a/apps/plugins/sort.c b/apps/plugins/sort.c
index 3d348c1178..f99549ebd7 100644
--- a/apps/plugins/sort.c
+++ b/apps/plugins/sort.c
@@ -185,7 +185,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 
     rb = api;
 
-    buf = rb->plugin_get_audio_buffer(&buf_size); /* start munching memory */
+    buf = rb->plugin_get_audio_buffer((size_t *)&buf_size); /* start munching memory */
 
     stringbuffer = buf;
     pointers = (char **)(buf + buf_size - sizeof(int));
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index 44cee39dd2..cda1d614c0 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -308,7 +308,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
 
     (void)parameter;
     rb = api;
-    audiobuf = rb->plugin_get_audio_buffer(&audiobufsize);
+    audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobufsize);
     rb->srand(*rb->current_tick);
 
     if (rb->global_settings->backlight_timeout > 0)
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c
index e3b74cbc0f..42353981a2 100644
--- a/apps/plugins/vbrfix.c
+++ b/apps/plugins/vbrfix.c
@@ -268,7 +268,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter)
     if (!parameter)
         return PLUGIN_ERROR;
 
-    audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
+    audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuflen);
     
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
     rb->cpu_boost(true);
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index 3700c233fe..f049974023 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -171,7 +171,7 @@ static struct
 /* buffer information */
 static struct
 {
-    int bufsize;
+    ssize_t bufsize;
     int granularity; /* common multiple of block and sector size */
     unsigned char* pBufStart; /* start of ring buffer */
     unsigned char* pBufEnd; /* end of ring buffer */
@@ -867,7 +867,7 @@ int main(char* filename)
     /* init buffer */
     rb->memset(&gBuf, 0, sizeof(gBuf));
     gBuf.pOSD = rb->lcd_framebuffer + LCD_WIDTH*7; /* last screen line */
-    gBuf.pBufStart = rb->plugin_get_audio_buffer(&gBuf.bufsize);
+    gBuf.pBufStart = rb->plugin_get_audio_buffer((size_t *)&gBuf.bufsize);
     /*gBuf.bufsize = 1700*1024; // test, like 2MB version!!!! */
     gBuf.pBufFill = gBuf.pBufStart; /* all empty */
 
diff --git a/apps/plugins/wav2wv.c b/apps/plugins/wav2wv.c
index a889bb848c..f3e191d30d 100644
--- a/apps/plugins/wav2wv.c
+++ b/apps/plugins/wav2wv.c
@@ -307,7 +307,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter)
     if (!parameter)
         return PLUGIN_ERROR;
 
-    audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
+    audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuflen);
 
     if (audiobuflen < 0x200000) {
         rb->splash(HZ*2, "not enough memory!");
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c
index e814ccb79c..6a969f187b 100644
--- a/apps/plugins/wavplay.c
+++ b/apps/plugins/wavplay.c
@@ -3666,7 +3666,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
         return PLUGIN_ERROR;
     }
 
-    aud_buf = rb->plugin_get_audio_buffer(&aud_size);
+    aud_buf = rb->plugin_get_audio_buffer((size_t *)&aud_size);
 
     switch (play_file((char*)parameter))
     {
diff --git a/apps/plugins/wavview.c b/apps/plugins/wavview.c
index f399e052a4..fbf2e4383d 100644
--- a/apps/plugins/wavview.c
+++ b/apps/plugins/wavview.c
@@ -367,7 +367,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter)
     if (!parameter)
         return PLUGIN_ERROR;
 
-    audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
+    audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuflen);
 
     if (!audiobuf)
     {
diff --git a/apps/plugins/zxbox/helpers.c b/apps/plugins/zxbox/helpers.c
index d6b25a2452..2343abb499 100644
--- a/apps/plugins/zxbox/helpers.c
+++ b/apps/plugins/zxbox/helpers.c
@@ -28,7 +28,7 @@ void *my_malloc(size_t size)
 
     if (offset == NULL)
     {
-        offset = rb->plugin_get_audio_buffer(&totalSize);
+        offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
     }
 
     if (size + 4 > abs(totalSize) )