diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-12-02 08:42:48 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-12-02 08:42:48 +0000 |
commit | 76667e2a5ba9fb919ad6f9f3db95343b6c3dcc8c (patch) | |
tree | 156db9e5535bcefabcd09128b4e4bf526f997fae /apps/codecs/dumb | |
parent | 5c1f9859e4ceffaf1e261e7dbfcc8ae9d7a254d0 (diff) |
fix gcc4 (un)signed warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8124 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/dumb')
-rw-r--r-- | apps/codecs/dumb/src/it/itread.c | 12 | ||||
-rw-r--r-- | apps/codecs/dumb/src/it/reads3m.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/codecs/dumb/src/it/itread.c b/apps/codecs/dumb/src/it/itread.c index 8b4a322ee1..0e789436d2 100644 --- a/apps/codecs/dumb/src/it/itread.c +++ b/apps/codecs/dumb/src/it/itread.c @@ -669,7 +669,7 @@ static int it_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buff return -1; /* Read in the pattern data. */ - dumbfile_getnc(buffer, buflen, f); + dumbfile_getnc((char *)buffer, buflen, f); if (dumbfile_error(f)) return -1; @@ -875,8 +875,8 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f) /* Skip Pitch Wheel Depth, Message Length, Message Offset and Reserved. */ dumbfile_skip(f, 11); - dumbfile_getnc(sigdata->channel_pan, DUMB_IT_N_CHANNELS, f); - dumbfile_getnc(sigdata->channel_volume, DUMB_IT_N_CHANNELS, f); + dumbfile_getnc((char *)sigdata->channel_pan, DUMB_IT_N_CHANNELS, f); + dumbfile_getnc((char *)sigdata->channel_volume, DUMB_IT_N_CHANNELS, f); if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_instruments > 256 || sigdata->n_samples > 256 || sigdata->n_patterns > 256) { _dumb_it_unload_sigdata(sigdata); @@ -917,7 +917,7 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f) sigdata->pattern[n].entry = NULL; } - dumbfile_getnc(sigdata->order, sigdata->n_orders, f); + dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f); sigdata->restart_position = 0; component = malloc(768 * sizeof(*component)); @@ -1000,7 +1000,7 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f) for (i = 0; i < 16; i++) { unsigned char len = 0; int j, leftdigit = -1; - if (dumbfile_getnc(mididata, 32, f) < 32) { + if (dumbfile_getnc((char *)mididata, 32, f) < 32) { free(component); _dumb_it_unload_sigdata(sigdata); return NULL; @@ -1032,7 +1032,7 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f) for (i = 0; i < 128; i++) { unsigned char len = 0; int j, leftdigit = -1; - dumbfile_getnc(mididata, 32, f); + dumbfile_getnc((char *)mididata, 32, f); for (j = 0; j < 32; j++) { if (leftdigit >= 0) { if (mididata[j] == 0) { diff --git a/apps/codecs/dumb/src/it/reads3m.c b/apps/codecs/dumb/src/it/reads3m.c index 6a8b84dd55..22152c8ff9 100644 --- a/apps/codecs/dumb/src/it/reads3m.c +++ b/apps/codecs/dumb/src/it/reads3m.c @@ -231,8 +231,8 @@ static int it_s3m_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char * b >>= 5; pattern->n_entries++; if (b) { - if (buflen + used[b] >= 65536) return -1; - dumbfile_getnc(buffer + buflen, used[b], f); + if (buflen + (signed char)used[b] >= 65536) return -1; + dumbfile_getnc((char *)buffer + buflen, used[b], f); buflen += used[b]; } else { /* End of row */ @@ -494,7 +494,7 @@ static DUMB_IT_SIGDATA *it_s3m_load_sigdata(DUMBFILE *f) } /* Orders, byte each, length = sigdata->n_orders (should be even) */ - dumbfile_getnc(sigdata->order, sigdata->n_orders, f); + dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f); sigdata->restart_position = 0; component = malloc(768*sizeof(*component)); |