From 31efab4909d129d7d340f6b30b1ac42d81f3efca Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 22 Jun 2005 19:55:09 +0000
Subject: [PATCH] removed the use of the 2nd argument to codec_start() since no
 codec used it anymore

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6814 a1c6a512-1295-4272-9138-f99709370657
---
 apps/codecs.c         | 4 ++--
 apps/codecs.h         | 2 +-
 apps/codecs/a52.c     | 2 +-
 apps/codecs/flac.c    | 2 +-
 apps/codecs/mpa.c     | 3 +--
 apps/codecs/mpc.c     | 2 +-
 apps/codecs/vorbis.c  | 4 +++-
 apps/codecs/wav.c     | 2 +-
 apps/codecs/wavpack.c | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/codecs.c b/apps/codecs.c
index d366c934da..05f835e193 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -297,7 +297,7 @@ const struct codec_api ci = {
 
 int codec_load_ram(char* codecptr, size_t size, void* ptr2, size_t bufwrap)
 {
-    enum codec_status (*codec_start)(const struct codec_api* api, void* param);
+    enum codec_status (*codec_start)(const struct codec_api* api);
     int copy_n;
     int status;
     
@@ -316,7 +316,7 @@ int codec_load_ram(char* codecptr, size_t size, void* ptr2, size_t bufwrap)
     codec_start = (void*)&codecbuf;
         
     invalidate_icache();
-    status = codec_start(&ci, NULL);
+    status = codec_start(&ci);
     
     return status;
 }
diff --git a/apps/codecs.h b/apps/codecs.h
index 2c2a4cfe43..ac5265c57c 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -397,7 +397,7 @@ int codec_load_file(const char* codec);
 #endif
 
 /* defined by the codec */
-enum codec_status codec_start(struct codec_api* rockbox, void* parameter)
+enum codec_status codec_start(struct codec_api* rockbox)
     __attribute__ ((section (".entry")));
 
 #endif
diff --git a/apps/codecs/a52.c b/apps/codecs/a52.c
index d35854e16e..bc711965ec 100644
--- a/apps/codecs/a52.c
+++ b/apps/codecs/a52.c
@@ -155,7 +155,7 @@ extern char iramend[];
 #endif
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
   size_t n;
   unsigned char* filebuf;
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index 93134bb801..07e5b8f566 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -160,7 +160,7 @@ extern char iramend[];
 #endif
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
     struct codec_api* ci = api;
     FLAC__SeekableStreamDecoder* flacDecoder;
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index beb71d78a5..bdd472caef 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -257,7 +257,7 @@ long resample(long *in, long *out, int num, struct resampler *s)
 }
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
     struct codec_api *ci = api;
     struct mp3info *info;
@@ -279,7 +279,6 @@ enum codec_status codec_start(struct codec_api* api, void* parm)
     struct resampler lr = { 0, 0, 0 }, rr = { 0, 0, 0 };
     long length;  
     /* Generic codec inititialisation */
-    (void)parm;
 
     TEST_CODEC_API(api);
     rb = api;
diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c
index 9b4a6164ef..fb8412e708 100644
--- a/apps/codecs/mpc.c
+++ b/apps/codecs/mpc.c
@@ -93,7 +93,7 @@ extern char iramend[];
 #endif
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
     struct codec_api* ci = api;
   unsigned short Sample;
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c
index 969fdf365b..f2939aa68d 100644
--- a/apps/codecs/vorbis.c
+++ b/apps/codecs/vorbis.c
@@ -46,6 +46,7 @@ char *strcat(char *dest, const char *src)
 
 size_t read_handler(void *ptr, size_t size, size_t nmemb, void *datasource)
 {
+    (void)datasource;
     return rb->read_filebuf(ptr, nmemb*size);
 }
 
@@ -66,6 +67,7 @@ int close_handler(void *datasource)
 
 long tell_handler(void *datasource)
 {
+    (void)datasource;
     return rb->curpos;
 }
 
@@ -80,7 +82,7 @@ extern char iramend[];
 static char pcmbuf[4096] IDATA_ATTR;
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
     ov_callbacks callbacks;
     OggVorbis_File vf;
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index d750b64b62..dfed97d64c 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -33,7 +33,7 @@ extern char iramend[];
 #endif
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
     struct codec_api* rb = api;
     struct codec_api* ci = api;
diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c
index e18dac6a36..2ea8f052df 100644
--- a/apps/codecs/wavpack.c
+++ b/apps/codecs/wavpack.c
@@ -42,7 +42,7 @@ extern char iramend[];
 #endif
 
 /* this is the codec entry point */
-enum codec_status codec_start(struct codec_api* api, void* parm)
+enum codec_status codec_start(struct codec_api* api)
 {
     WavpackContext *wpc;
     char error [80];