From 34d974015e55e2f7605e0a6cb3aa638bbe4000ae Mon Sep 17 00:00:00 2001
From: Buschel <Buschel@a1c6a512-1295-4272-9138-f99709370657>
Date: Tue, 3 May 2011 20:28:56 +0000
Subject: [PATCH] Fix even more 'variable set but not used' warnings reported
 from GCC 4.6.0.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29819 a1c6a512-1295-4272-9138-f99709370657
---
 apps/codecs/librm/rm.c        | 6 ++++--
 apps/plugins/plasma.c         | 4 ++--
 apps/plugins/rockboy/loader.c | 3 +--
 apps/tagcache.c               | 4 ++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/codecs/librm/rm.c b/apps/codecs/librm/rm.c
index b543da50d..6bc187bb5 100644
--- a/apps/codecs/librm/rm.c
+++ b/apps/codecs/librm/rm.c
@@ -503,7 +503,9 @@ void rm_get_packet_fd(int fd,RMContext *rmctx, RMPacket *pkt)
 int rm_get_packet(uint8_t **src,RMContext *rmctx, RMPacket *pkt)
 {   
     int consumed = 0;
+    /* rockbox: comment 'set but unused' variables
     uint8_t unknown;
+    */
     uint16_t x, place;
     uint16_t sps = rmctx->sub_packet_size;
     uint16_t h = rmctx->sub_packet_h;
@@ -528,11 +530,11 @@ int rm_get_packet(uint8_t **src,RMContext *rmctx, RMPacket *pkt)
                "    length  = %d\n"
                "    stream  = %d\n"
                "    timestamp= %d\n\n",pkt->version,pkt->length,pkt->stream_number,pkt->timestamp);*/
-        unknown      = rm_get_uint8(*src+10);
+        /* unknown =*/ rm_get_uint8(*src+10);
         pkt->flags   = rm_get_uint8(*src+11);
 
         if(pkt->version == 1)
-            unknown = rm_get_uint8(*src+10);
+            /* unknown = */ rm_get_uint8(*src+10);
 
         if (pkt->flags & 2) /* keyframe */
             y = rmctx->sub_packet_cnt = 0;
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index 4359e6e8b..e82459385 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -155,8 +155,8 @@ int main(void)
     plasma_frequency = 1;
     int action, x, y;
     unsigned char p1,p2,p3,p4,t1,t2,t3,t4, z,z0;
-    long last_tick = *rb->current_tick;
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    long last_tick = *rb->current_tick;
     int delay;
     int cumulated_lag = 0;
 #endif
@@ -257,10 +257,10 @@ int main(void)
             if (--cumulated_lag <= 0)   /* slow decrease */
                 rb->cpu_boost(boosted = false);
         }
+        last_tick = *rb->current_tick;
 #endif
         action = pluginlib_getaction(0, plugin_contexts,
                         ARRAYLEN(plugin_contexts));
-        last_tick = *rb->current_tick;
 
         switch(action)
         {
diff --git a/apps/plugins/rockboy/loader.c b/apps/plugins/rockboy/loader.c
index d843ba8a6..6065cf289 100644
--- a/apps/plugins/rockboy/loader.c
+++ b/apps/plugins/rockboy/loader.c
@@ -124,7 +124,6 @@ static void initmem(void *mem, int size)
 
 static byte *loadfile(int fd, int *len)
 {
-    int c;
     byte *d;
 
     *len=lseek(fd,0,SEEK_END);
@@ -136,7 +135,7 @@ static byte *loadfile(int fd, int *len)
     }
     lseek(fd,0,SEEK_SET);
     
-    c = read(fd, d, *len);
+    read(fd, d, *len);
 
     return d;
 }
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 5abb32a10..75191d678 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -1396,7 +1396,9 @@ static bool get_next(struct tagcache_search *tcs)
 {
     static char buf[TAG_MAXLEN+32];
     struct tagfile_entry entry;
+#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
     long flag = 0;
+#endif
 
     if (!tcs->valid || !tc_stat.ready)
         return false;
@@ -1433,7 +1435,9 @@ static bool get_next(struct tagcache_search *tcs)
         }
         
         seeklist = &tcs->seeklist[tcs->list_position];
+#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
         flag = seeklist->flag;
+#endif
         tcs->position = seeklist->seek;
         tcs->idx_id = seeklist->idx_id;
         tcs->list_position++;
-- 
2.11.4.GIT