summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-09-03 23:54:43 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-09-03 23:54:43 +0000
commit6cb5ec1bfef3ca621a1de8e3f7dda0f333407961 (patch)
treebffdc904dc164b364e5e2d8be6e5e006806d98e7 /apps
parentbd9c172b9eba76f22987096662467917abdc6b85 (diff)
downloadrockbox-6cb5ec1bfef3ca621a1de8e3f7dda0f333407961.tar.gz
rockbox-6cb5ec1bfef3ca621a1de8e3f7dda0f333407961.zip
Remove several 'set but not used' GCC 4.6.1 warnings from MikMod.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30426 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/mikmod/load_far.c4
-rw-r--r--apps/plugins/mikmod/load_it.c8
-rw-r--r--apps/plugins/mikmod/mikmod.c4
-rw-r--r--apps/plugins/mikmod/mlutil.c4
4 files changed, 9 insertions, 11 deletions
diff --git a/apps/plugins/mikmod/load_far.c b/apps/plugins/mikmod/load_far.c
index bbb3c39d91..a45e207737 100644
--- a/apps/plugins/mikmod/load_far.c
+++ b/apps/plugins/mikmod/load_far.c
@@ -238,12 +238,12 @@ int FAR_Load(int curious)
238 if(!AllocPatterns()) return 0; 238 if(!AllocPatterns()) return 0;
239 239
240 for(t=0;t<of.numpat;t++) { 240 for(t=0;t<of.numpat;t++) {
241 UBYTE rows=0,tempo; 241 UBYTE rows=0/* ,tempo */;
242 242
243 memset(pat,0,256*16*4*sizeof(FARNOTE)); 243 memset(pat,0,256*16*4*sizeof(FARNOTE));
244 if(mh2->patsiz[t]) { 244 if(mh2->patsiz[t]) {
245 rows = _mm_read_UBYTE(modreader); 245 rows = _mm_read_UBYTE(modreader);
246 tempo = _mm_read_UBYTE(modreader); 246 /* tempo = */ (void)_mm_read_UBYTE(modreader);
247 247
248 crow = pat; 248 crow = pat;
249 /* file often allocates 64 rows even if there are less in pattern */ 249 /* file often allocates 64 rows even if there are less in pattern */
diff --git a/apps/plugins/mikmod/load_it.c b/apps/plugins/mikmod/load_it.c
index 842fafe471..7f966339cf 100644
--- a/apps/plugins/mikmod/load_it.c
+++ b/apps/plugins/mikmod/load_it.c
@@ -446,7 +446,7 @@ int IT_Load(int curious)
446 int t,u,lp; 446 int t,u,lp;
447 INSTRUMENT *d; 447 INSTRUMENT *d;
448 SAMPLE *q; 448 SAMPLE *q;
449 int compressed=0; 449 /* int compressed=0; */
450 450
451 numtrk=0; 451 numtrk=0;
452 filters=0; 452 filters=0;
@@ -672,7 +672,7 @@ int IT_Load(int curious)
672 if(s.flag&2) q->flags|=SF_16BITS; 672 if(s.flag&2) q->flags|=SF_16BITS;
673 if((s.flag&8)&&(mh->cwt>=0x214)) { 673 if((s.flag&8)&&(mh->cwt>=0x214)) {
674 q->flags|=SF_ITPACKED; 674 q->flags|=SF_ITPACKED;
675 compressed=1; 675 /* compressed=1; */
676 } 676 }
677 if(s.flag&16) q->flags|=SF_LOOP; 677 if(s.flag&16) q->flags|=SF_LOOP;
678 if(s.flag&64) q->flags|=SF_BIDI; 678 if(s.flag&64) q->flags|=SF_BIDI;
@@ -963,8 +963,6 @@ int IT_Load(int curious)
963 if(!AllocTracks()) return 0; 963 if(!AllocTracks()) return 0;
964 964
965 for(t=0;t<of.numpat;t++) { 965 for(t=0;t<of.numpat;t++) {
966 UWORD packlen;
967
968 /* seek to pattern position */ 966 /* seek to pattern position */
969 if(!paraptr[mh->insnum+mh->smpnum+t]) { /* 0 -> empty 64 row pattern */ 967 if(!paraptr[mh->insnum+mh->smpnum+t]) { /* 0 -> empty 64 row pattern */
970 of.pattrows[t]=64; 968 of.pattrows[t]=64;
@@ -977,7 +975,7 @@ int IT_Load(int curious)
977 } 975 }
978 } else { 976 } else {
979 _mm_fseek(modreader,((long)paraptr[mh->insnum+mh->smpnum+t]),SEEK_SET); 977 _mm_fseek(modreader,((long)paraptr[mh->insnum+mh->smpnum+t]),SEEK_SET);
980 packlen=_mm_read_I_UWORD(modreader); 978 (void)_mm_read_I_UWORD(modreader);
981 of.pattrows[t]=_mm_read_I_UWORD(modreader); 979 of.pattrows[t]=_mm_read_I_UWORD(modreader);
982 _mm_read_I_ULONG(modreader); 980 _mm_read_I_ULONG(modreader);
983 if(!IT_ReadPattern(of.pattrows[t])) return 0; 981 if(!IT_ReadPattern(of.pattrows[t])) return 0;
diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c
index 63d575a958..5f19b43759 100644
--- a/apps/plugins/mikmod/mikmod.c
+++ b/apps/plugins/mikmod/mikmod.c
@@ -115,11 +115,11 @@ void mmsupp_printf(const char *fmt, ...)
115{ 115{
116 static int p_xtpt = 0; 116 static int p_xtpt = 0;
117 char p_buf[LINE_LENGTH]; 117 char p_buf[LINE_LENGTH];
118 bool ok; 118 /* bool ok; */
119 va_list ap; 119 va_list ap;
120 120
121 va_start(ap, fmt); 121 va_start(ap, fmt);
122 ok = rb->vsnprintf(p_buf, sizeof(p_buf), fmt, ap); 122 /* ok = */ (void)rb->vsnprintf(p_buf, sizeof(p_buf), fmt, ap);
123 va_end(ap); 123 va_end(ap);
124 124
125 int i=0; 125 int i=0;
diff --git a/apps/plugins/mikmod/mlutil.c b/apps/plugins/mikmod/mlutil.c
index 114deb6b24..ddaddc7871 100644
--- a/apps/plugins/mikmod/mlutil.c
+++ b/apps/plugins/mikmod/mlutil.c
@@ -143,10 +143,10 @@ void S3MIT_CreateOrders(int curious)
143/* handles S3M and IT effects */ 143/* handles S3M and IT effects */
144void S3MIT_ProcessCmd(UBYTE cmd,UBYTE inf,unsigned int flags) 144void S3MIT_ProcessCmd(UBYTE cmd,UBYTE inf,unsigned int flags)
145{ 145{
146 UBYTE hi,lo; 146 UBYTE /* hi,*/ lo;
147 147
148 lo=inf&0xf; 148 lo=inf&0xf;
149 hi=inf>>4; 149 /* hi=inf>>4; */
150 150
151 /* process S3M / IT specific command structure */ 151 /* process S3M / IT specific command structure */
152 152