summaryrefslogtreecommitdiff
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
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
-rw-r--r--apps/codecs/Tremor/vorbisfile.c4
-rw-r--r--apps/codecs/aac.c4
-rw-r--r--apps/codecs/alac.c4
-rw-r--r--apps/codecs/dumb/src/it/itread.c12
-rw-r--r--apps/codecs/dumb/src/it/reads3m.c6
-rw-r--r--apps/codecs/libwavpack/unpack.c2
-rw-r--r--apps/codecs/mpa.c2
-rw-r--r--apps/codecs/shorten.c6
8 files changed, 20 insertions, 20 deletions
diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c
index 70c0cdb24e..50f827dae7 100644
--- a/apps/codecs/Tremor/vorbisfile.c
+++ b/apps/codecs/Tremor/vorbisfile.c
@@ -63,7 +63,7 @@
63static long _get_data(OggVorbis_File *vf){ 63static long _get_data(OggVorbis_File *vf){
64 errno=0; 64 errno=0;
65 if(vf->datasource){ 65 if(vf->datasource){
66 char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE); 66 char *buffer=(char *)ogg_sync_bufferin(vf->oy,CHUNKSIZE);
67 long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource); 67 long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource);
68 if(bytes>0)ogg_sync_wrote(vf->oy,bytes); 68 if(bytes>0)ogg_sync_wrote(vf->oy,bytes);
69 if(bytes==0 && errno)return(-1); 69 if(bytes==0 && errno)return(-1);
@@ -682,7 +682,7 @@ static int _ov_open1(void *f,OggVorbis_File *vf,char *initial,
682 previously read data (as we may be reading from a non-seekable 682 previously read data (as we may be reading from a non-seekable
683 stream) */ 683 stream) */
684 if(initial){ 684 if(initial){
685 char *buffer=ogg_sync_bufferin(vf->oy,ibytes); 685 char *buffer=(char *)ogg_sync_bufferin(vf->oy,ibytes);
686 memcpy(buffer,initial,ibytes); 686 memcpy(buffer,initial,ibytes);
687 ogg_sync_wrote(vf->oy,ibytes); 687 ogg_sync_wrote(vf->oy,ibytes);
688 } 688 }
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index c62fb2d007..a6ce0170a9 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -124,9 +124,9 @@ enum codec_status codec_start(struct codec_api* api)
124 124
125 /* Deal with any pending seek requests */ 125 /* Deal with any pending seek requests */
126 if (ci->seek_time) { 126 if (ci->seek_time) {
127 if (alac_seek(&demux_res,&input_stream, 127 if (alac_seek(&demux_res, &input_stream,
128 ((ci->seek_time-1)/10) * (ci->id3->frequency/100), 128 ((ci->seek_time-1)/10) * (ci->id3->frequency/100),
129 &samplesdone, &i)) { 129 &samplesdone, (int *)&i)) {
130 elapsedtime=(samplesdone*10)/(ci->id3->frequency/100); 130 elapsedtime=(samplesdone*10)/(ci->id3->frequency/100);
131 ci->set_elapsed(elapsedtime); 131 ci->set_elapsed(elapsedtime);
132 } 132 }
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index deb1e289a7..58ab111755 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -101,9 +101,9 @@ enum codec_status codec_start(struct codec_api* api)
101 101
102 /* Deal with any pending seek requests */ 102 /* Deal with any pending seek requests */
103 if (ci->seek_time) { 103 if (ci->seek_time) {
104 if (alac_seek(&demux_res,&input_stream, 104 if (alac_seek(&demux_res, &input_stream,
105 ((ci->seek_time-1)/10) * (ci->id3->frequency/100), 105 ((ci->seek_time-1)/10) * (ci->id3->frequency/100),
106 &samplesdone, &i)) { 106 &samplesdone, (int *)&i)) {
107 elapsedtime=(samplesdone*10)/(ci->id3->frequency/100); 107 elapsedtime=(samplesdone*10)/(ci->id3->frequency/100);
108 ci->set_elapsed(elapsedtime); 108 ci->set_elapsed(elapsedtime);
109 } 109 }
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));
diff --git a/apps/codecs/libwavpack/unpack.c b/apps/codecs/libwavpack/unpack.c
index 76198a7af8..82e5baaaba 100644
--- a/apps/codecs/libwavpack/unpack.c
+++ b/apps/codecs/libwavpack/unpack.c
@@ -79,7 +79,7 @@ int init_wv_bitstream (WavpackContext *wpc, WavpackMetadata *wpmd)
79 WavpackStream *wps = &wpc->stream; 79 WavpackStream *wps = &wpc->stream;
80 80
81 if (wpmd->data) 81 if (wpmd->data)
82 bs_open_read (&wps->wvbits, wpmd->data, (char *) wpmd->data + wpmd->byte_length, NULL, 0); 82 bs_open_read (&wps->wvbits, wpmd->data, (unsigned char *) wpmd->data + wpmd->byte_length, NULL, 0);
83 else if (wpmd->byte_length) 83 else if (wpmd->byte_length)
84 bs_open_read (&wps->wvbits, wpc->read_buffer, wpc->read_buffer + sizeof (wpc->read_buffer), 84 bs_open_read (&wps->wvbits, wpc->read_buffer, wpc->read_buffer + sizeof (wpc->read_buffer),
85 wpc->infile, wpmd->byte_length + (wpmd->byte_length & 1)); 85 wpc->infile, wpmd->byte_length + (wpmd->byte_length & 1));
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index 281a7abba1..8b93810097 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -167,7 +167,7 @@ next_track:
167 inputbuffer = ci->request_buffer(&size, INPUT_CHUNK_SIZE); 167 inputbuffer = ci->request_buffer(&size, INPUT_CHUNK_SIZE);
168 if (size == 0 || inputbuffer == NULL) 168 if (size == 0 || inputbuffer == NULL)
169 break; 169 break;
170 mad_stream_buffer(&stream, inputbuffer, size); 170 mad_stream_buffer(&stream, (unsigned char *)inputbuffer, size);
171 } 171 }
172 172
173 if (mad_frame_decode(&frame, &stream)) { 173 if (mad_frame_decode(&frame, &stream)) {
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index 26b5e09d6c..c58b009ab1 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -85,7 +85,7 @@ next_track:
85 85
86 /* Read the shorten & wave headers */ 86 /* Read the shorten & wave headers */
87 buf = ci->request_buffer(&bytesleft, MAX_FRAMESIZE); 87 buf = ci->request_buffer(&bytesleft, MAX_FRAMESIZE);
88 res = shorten_init(&sc, buf, bytesleft); 88 res = shorten_init(&sc, (unsigned char *)buf, bytesleft);
89 if (res < 0) { 89 if (res < 0) {
90 LOGF("shorten_init error: %d\n", res); 90 LOGF("shorten_init error: %d\n", res);
91 return CODEC_ERROR; 91 return CODEC_ERROR;
@@ -139,10 +139,10 @@ seek_start:
139 ci->yield(); 139 ci->yield();
140 if (cur_chan == 0) { 140 if (cur_chan == 0) {
141 res = shorten_decode_frame(&sc, decoded0 + sc.nwrap, offset0, 141 res = shorten_decode_frame(&sc, decoded0 + sc.nwrap, offset0,
142 buf, bytesleft); 142 (unsigned char *)buf, bytesleft);
143 } else { 143 } else {
144 res = shorten_decode_frame(&sc, decoded1 + sc.nwrap, offset1, 144 res = shorten_decode_frame(&sc, decoded1 + sc.nwrap, offset1,
145 buf, bytesleft); 145 (unsigned char *)buf, bytesleft);
146 } 146 }
147 cur_chan++; 147 cur_chan++;
148 148