Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove several 'set but not used' GCC 4.6.1 warnings from MikMod.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30426 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-09-03 23:54:43 +00:00
parent bd9c172b9e
commit 6cb5ec1bfe
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/plugins/mikmod/load_far.c
View file

@ -238,12 +238,12 @@ int FAR_Load(int curious)
if(!AllocPatterns()) return 0; if(!AllocPatterns()) return 0;
for(t=0;t<of.numpat;t++) { for(t=0;t<of.numpat;t++) {
UBYTE rows=0,tempo; UBYTE rows=0/* ,tempo */;
memset(pat,0,256*16*4*sizeof(FARNOTE)); memset(pat,0,256*16*4*sizeof(FARNOTE));
if(mh2->patsiz[t]) { if(mh2->patsiz[t]) {
rows = _mm_read_UBYTE(modreader); rows = _mm_read_UBYTE(modreader);
tempo = _mm_read_UBYTE(modreader); /* tempo = */ (void)_mm_read_UBYTE(modreader);
crow = pat; crow = pat;
/* file often allocates 64 rows even if there are less in pattern */ /* file often allocates 64 rows even if there are less in pattern */

8
apps/plugins/mikmod/load_it.c
View file

@ -446,7 +446,7 @@ int IT_Load(int curious)
int t,u,lp; int t,u,lp;
INSTRUMENT *d; INSTRUMENT *d;
SAMPLE *q; SAMPLE *q;
int compressed=0; /* int compressed=0; */
numtrk=0; numtrk=0;
filters=0; filters=0;
@ -672,7 +672,7 @@ int IT_Load(int curious)
if(s.flag&2) q->flags|=SF_16BITS; if(s.flag&2) q->flags|=SF_16BITS;
if((s.flag&8)&&(mh->cwt>=0x214)) { if((s.flag&8)&&(mh->cwt>=0x214)) {
q->flags|=SF_ITPACKED; q->flags|=SF_ITPACKED;
compressed=1; /* compressed=1; */
} }
if(s.flag&16) q->flags|=SF_LOOP; if(s.flag&16) q->flags|=SF_LOOP;
if(s.flag&64) q->flags|=SF_BIDI; if(s.flag&64) q->flags|=SF_BIDI;
@ -963,8 +963,6 @@ int IT_Load(int curious)
if(!AllocTracks()) return 0; if(!AllocTracks()) return 0;
for(t=0;t<of.numpat;t++) { for(t=0;t<of.numpat;t++) {
UWORD packlen;
/* seek to pattern position */ /* seek to pattern position */
if(!paraptr[mh->insnum+mh->smpnum+t]) { /* 0 -> empty 64 row pattern */ if(!paraptr[mh->insnum+mh->smpnum+t]) { /* 0 -> empty 64 row pattern */
of.pattrows[t]=64; of.pattrows[t]=64;
@ -977,7 +975,7 @@ int IT_Load(int curious)
} }
} else { } else {
_mm_fseek(modreader,((long)paraptr[mh->insnum+mh->smpnum+t]),SEEK_SET); _mm_fseek(modreader,((long)paraptr[mh->insnum+mh->smpnum+t]),SEEK_SET);
packlen=_mm_read_I_UWORD(modreader); (void)_mm_read_I_UWORD(modreader);
of.pattrows[t]=_mm_read_I_UWORD(modreader); of.pattrows[t]=_mm_read_I_UWORD(modreader);
_mm_read_I_ULONG(modreader); _mm_read_I_ULONG(modreader);
if(!IT_ReadPattern(of.pattrows[t])) return 0; if(!IT_ReadPattern(of.pattrows[t])) return 0;

4
apps/plugins/mikmod/mikmod.c
View file

@ -115,11 +115,11 @@ void mmsupp_printf(const char *fmt, ...)
{ {
static int p_xtpt = 0; static int p_xtpt = 0;
char p_buf[LINE_LENGTH]; char p_buf[LINE_LENGTH];
bool ok; /* bool ok; */
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
ok = rb->vsnprintf(p_buf, sizeof(p_buf), fmt, ap); /* ok = */ (void)rb->vsnprintf(p_buf, sizeof(p_buf), fmt, ap);
va_end(ap); va_end(ap);
int i=0; int i=0;

4
apps/plugins/mikmod/mlutil.c
View file

@ -143,10 +143,10 @@ void S3MIT_CreateOrders(int curious)
/* handles S3M and IT effects */ /* handles S3M and IT effects */
void S3MIT_ProcessCmd(UBYTE cmd,UBYTE inf,unsigned int flags) void S3MIT_ProcessCmd(UBYTE cmd,UBYTE inf,unsigned int flags)
{ {
UBYTE hi,lo; UBYTE /* hi,*/ lo;
lo=inf&0xf; lo=inf&0xf;
hi=inf>>4; /* hi=inf>>4; */
/* process S3M / IT specific command structure */ /* process S3M / IT specific command structure */