summaryrefslogtreecommitdiff
path: root/apps/codecs/dumb
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-12-02 08:42:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-12-02 08:42:48 +0000
commit76667e2a5ba9fb919ad6f9f3db95343b6c3dcc8c (patch)
tree156db9e5535bcefabcd09128b4e4bf526f997fae /apps/codecs/dumb
parent5c1f9859e4ceffaf1e261e7dbfcc8ae9d7a254d0 (diff)
downloadrockbox-76667e2a5ba9fb919ad6f9f3db95343b6c3dcc8c.tar.gz
rockbox-76667e2a5ba9fb919ad6f9f3db95343b6c3dcc8c.zip
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.c12
-rw-r--r--apps/codecs/dumb/src/it/reads3m.c6
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
669 return -1; 669 return -1;
670 670
671 /* Read in the pattern data. */ 671 /* Read in the pattern data. */
672 dumbfile_getnc(buffer, buflen, f); 672 dumbfile_getnc((char *)buffer, buflen, f);
673 673
674 if (dumbfile_error(f)) 674 if (dumbfile_error(f))
675 return -1; 675 return -1;
@@ -875,8 +875,8 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f)
875 /* Skip Pitch Wheel Depth, Message Length, Message Offset and Reserved. */ 875 /* Skip Pitch Wheel Depth, Message Length, Message Offset and Reserved. */
876 dumbfile_skip(f, 11); 876 dumbfile_skip(f, 11);
877 877
878 dumbfile_getnc(sigdata->channel_pan, DUMB_IT_N_CHANNELS, f); 878 dumbfile_getnc((char *)sigdata->channel_pan, DUMB_IT_N_CHANNELS, f);
879 dumbfile_getnc(sigdata->channel_volume, DUMB_IT_N_CHANNELS, f); 879 dumbfile_getnc((char *)sigdata->channel_volume, DUMB_IT_N_CHANNELS, f);
880 880
881 if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_instruments > 256 || sigdata->n_samples > 256 || sigdata->n_patterns > 256) { 881 if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_instruments > 256 || sigdata->n_samples > 256 || sigdata->n_patterns > 256) {
882 _dumb_it_unload_sigdata(sigdata); 882 _dumb_it_unload_sigdata(sigdata);
@@ -917,7 +917,7 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f)
917 sigdata->pattern[n].entry = NULL; 917 sigdata->pattern[n].entry = NULL;
918 } 918 }
919 919
920 dumbfile_getnc(sigdata->order, sigdata->n_orders, f); 920 dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f);
921 sigdata->restart_position = 0; 921 sigdata->restart_position = 0;
922 922
923 component = malloc(768 * sizeof(*component)); 923 component = malloc(768 * sizeof(*component));
@@ -1000,7 +1000,7 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f)
1000 for (i = 0; i < 16; i++) { 1000 for (i = 0; i < 16; i++) {
1001 unsigned char len = 0; 1001 unsigned char len = 0;
1002 int j, leftdigit = -1; 1002 int j, leftdigit = -1;
1003 if (dumbfile_getnc(mididata, 32, f) < 32) { 1003 if (dumbfile_getnc((char *)mididata, 32, f) < 32) {
1004 free(component); 1004 free(component);
1005 _dumb_it_unload_sigdata(sigdata); 1005 _dumb_it_unload_sigdata(sigdata);
1006 return NULL; 1006 return NULL;
@@ -1032,7 +1032,7 @@ static sigdata_t *it_load_sigdata(DUMBFILE *f)
1032 for (i = 0; i < 128; i++) { 1032 for (i = 0; i < 128; i++) {
1033 unsigned char len = 0; 1033 unsigned char len = 0;
1034 int j, leftdigit = -1; 1034 int j, leftdigit = -1;
1035 dumbfile_getnc(mididata, 32, f); 1035 dumbfile_getnc((char *)mididata, 32, f);
1036 for (j = 0; j < 32; j++) { 1036 for (j = 0; j < 32; j++) {
1037 if (leftdigit >= 0) { 1037 if (leftdigit >= 0) {
1038 if (mididata[j] == 0) { 1038 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 *
231 b >>= 5; 231 b >>= 5;
232 pattern->n_entries++; 232 pattern->n_entries++;
233 if (b) { 233 if (b) {
234 if (buflen + used[b] >= 65536) return -1; 234 if (buflen + (signed char)used[b] >= 65536) return -1;
235 dumbfile_getnc(buffer + buflen, used[b], f); 235 dumbfile_getnc((char *)buffer + buflen, used[b], f);
236 buflen += used[b]; 236 buflen += used[b];
237 } else { 237 } else {
238 /* End of row */ 238 /* End of row */
@@ -494,7 +494,7 @@ static DUMB_IT_SIGDATA *it_s3m_load_sigdata(DUMBFILE *f)
494 } 494 }
495 495
496 /* Orders, byte each, length = sigdata->n_orders (should be even) */ 496 /* Orders, byte each, length = sigdata->n_orders (should be even) */
497 dumbfile_getnc(sigdata->order, sigdata->n_orders, f); 497 dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f);
498 sigdata->restart_position = 0; 498 sigdata->restart_position = 0;
499 499
500 component = malloc(768*sizeof(*component)); 500 component = malloc(768*sizeof(*component));