summaryrefslogtreecommitdiff
path: root/apps/plugins/mikmod/load_asy.c
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-09-03 23:17:42 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-09-03 23:17:42 +0000
commite2186479d56762d097b943696423ad8588ca7f92 (patch)
tree833fb9909a1842e1eb216a695d7bc507855be4e5 /apps/plugins/mikmod/load_asy.c
parent7887e596a99fcaf2198d624bfedf5e2ad97a49cd (diff)
downloadrockbox-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_asy.c')
-rw-r--r--apps/plugins/mikmod/load_asy.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/mikmod/load_asy.c b/apps/plugins/mikmod/load_asy.c
index 356a686d92..46e899f6bd 100644
--- a/apps/plugins/mikmod/load_asy.c
+++ b/apps/plugins/mikmod/load_asy.c
@@ -237,7 +237,8 @@ static UBYTE *ConvertTrack(MODNOTE *n)
237/* Loads all patterns of a modfile and converts them into the 3 byte format. */ 237/* Loads all patterns of a modfile and converts them into the 3 byte format. */
238static int ML_LoadPatterns(void) 238static int ML_LoadPatterns(void)
239{ 239{
240 int t, s, tracks = 0; 240 int t, tracks = 0;
241 unsigned int s;
241 242
242 if (!AllocPatterns()) { 243 if (!AllocPatterns()) {
243 return 0; 244 return 0;
@@ -277,6 +278,7 @@ static int ASY_Load(int curious)
277 MSAMPINFO *s; 278 MSAMPINFO *s;
278 CHAR *descr=asylum; 279 CHAR *descr=asylum;
279 ULONG seekpos; 280 ULONG seekpos;
281 (void)curious;
280 282
281 // no title in asylum amf files :( 283 // no title in asylum amf files :(
282 strcpy(mh->songname, ""); 284 strcpy(mh->songname, "");
@@ -286,7 +288,7 @@ static int ASY_Load(int curious)
286 mh->num_orders = _mm_read_UBYTE(modreader); 288 mh->num_orders = _mm_read_UBYTE(modreader);
287 289
288 // skip unknown byte 290 // skip unknown byte
289 _mm_read_UBYTE(modreader); 291 (void)_mm_read_UBYTE(modreader);
290 _mm_read_UBYTES(mh->positions, 256, modreader); 292 _mm_read_UBYTES(mh->positions, 256, modreader);
291 293
292 /* read samples headers*/ 294 /* read samples headers*/
@@ -300,7 +302,7 @@ static int ASY_Load(int curious)
300 302
301 s->finetune = _mm_read_UBYTE(modreader); 303 s->finetune = _mm_read_UBYTE(modreader);
302 s->volume = _mm_read_UBYTE(modreader); 304 s->volume = _mm_read_UBYTE(modreader);
303 _mm_read_UBYTE(modreader); // skip unknown byte 305 (void)_mm_read_UBYTE(modreader); // skip unknown byte
304 s->length = _mm_read_I_ULONG(modreader); 306 s->length = _mm_read_I_ULONG(modreader);
305 s->reppos = _mm_read_I_ULONG(modreader); 307 s->reppos = _mm_read_I_ULONG(modreader);
306 s->replen = _mm_read_I_ULONG(modreader); 308 s->replen = _mm_read_I_ULONG(modreader);