diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-03 23:17:42 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-03 23:17:42 +0000 |
commit | e2186479d56762d097b943696423ad8588ca7f92 (patch) | |
tree | 833fb9909a1842e1eb216a695d7bc507855be4e5 /apps/plugins/mikmod/load_imf.c | |
parent | 7887e596a99fcaf2198d624bfedf5e2ad97a49cd (diff) | |
download | rockbox-e2186479d56762d097b943696423ad8588ca7f92.tar.gz rockbox-e2186479d56762d097b943696423ad8588ca7f92.zip |
FS#12259: Remove '-w' compiler option for MikMod. Resolve all yet unreported compiler warnings and fix a bug in load_gt2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30424 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mikmod/load_imf.c')
-rw-r--r-- | apps/plugins/mikmod/load_imf.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/plugins/mikmod/load_imf.c b/apps/plugins/mikmod/load_imf.c index 0b85c0ecc3..568af2935e 100644 --- a/apps/plugins/mikmod/load_imf.c +++ b/apps/plugins/mikmod/load_imf.c | |||
@@ -388,6 +388,7 @@ int IMF_Load(int curious) | |||
388 | ULONG *nextwav=NULL; | 388 | ULONG *nextwav=NULL; |
389 | UWORD wavcnt=0; | 389 | UWORD wavcnt=0; |
390 | UBYTE id[4]; | 390 | UBYTE id[4]; |
391 | (void)curious; | ||
391 | 392 | ||
392 | /* try to read the module header */ | 393 | /* try to read the module header */ |
393 | _mm_read_string(mh->songname,32,modreader); | 394 | _mm_read_string(mh->songname,32,modreader); |
@@ -515,9 +516,9 @@ int IMF_Load(int curious) | |||
515 | ih. name##beg=_mm_read_UBYTE(modreader); \ | 516 | ih. name##beg=_mm_read_UBYTE(modreader); \ |
516 | ih. name##end=_mm_read_UBYTE(modreader); \ | 517 | ih. name##end=_mm_read_UBYTE(modreader); \ |
517 | ih. name##flg=_mm_read_UBYTE(modreader); \ | 518 | ih. name##flg=_mm_read_UBYTE(modreader); \ |
518 | _mm_read_UBYTE(modreader); \ | 519 | (void)_mm_read_UBYTE(modreader); \ |
519 | _mm_read_UBYTE(modreader); \ | 520 | (void)_mm_read_UBYTE(modreader); \ |
520 | _mm_read_UBYTE(modreader) | 521 | (void)_mm_read_UBYTE(modreader) |
521 | #else | 522 | #else |
522 | #define IMF_FinishLoadingEnvelope(name) \ | 523 | #define IMF_FinishLoadingEnvelope(name) \ |
523 | ih. name/**/pts=_mm_read_UBYTE(modreader); \ | 524 | ih. name/**/pts=_mm_read_UBYTE(modreader); \ |
@@ -525,9 +526,9 @@ int IMF_Load(int curious) | |||
525 | ih. name/**/beg=_mm_read_UBYTE(modreader); \ | 526 | ih. name/**/beg=_mm_read_UBYTE(modreader); \ |
526 | ih. name/**/end=_mm_read_UBYTE(modreader); \ | 527 | ih. name/**/end=_mm_read_UBYTE(modreader); \ |
527 | ih. name/**/flg=_mm_read_UBYTE(modreader); \ | 528 | ih. name/**/flg=_mm_read_UBYTE(modreader); \ |
528 | _mm_read_UBYTE(modreader); \ | 529 | (void)_mm_read_UBYTE(modreader); \ |
529 | _mm_read_UBYTE(modreader); \ | 530 | (void)_mm_read_UBYTE(modreader); \ |
530 | _mm_read_UBYTE(modreader) | 531 | (void)_mm_read_UBYTE(modreader) |
531 | #endif | 532 | #endif |
532 | 533 | ||
533 | IMF_FinishLoadingEnvelope(vol); | 534 | IMF_FinishLoadingEnvelope(vol); |
@@ -626,7 +627,7 @@ int IMF_Load(int curious) | |||
626 | } | 627 | } |
627 | 628 | ||
628 | _mm_read_string(s->samplename,13,modreader); | 629 | _mm_read_string(s->samplename,13,modreader); |
629 | _mm_read_UBYTE(modreader);_mm_read_UBYTE(modreader);_mm_read_UBYTE(modreader); | 630 | (void)_mm_read_UBYTE(modreader);(void)_mm_read_UBYTE(modreader);(void)_mm_read_UBYTE(modreader); |
630 | s->length =_mm_read_I_ULONG(modreader); | 631 | s->length =_mm_read_I_ULONG(modreader); |
631 | s->loopstart =_mm_read_I_ULONG(modreader); | 632 | s->loopstart =_mm_read_I_ULONG(modreader); |
632 | s->loopend =_mm_read_I_ULONG(modreader); | 633 | s->loopend =_mm_read_I_ULONG(modreader); |