From 76667e2a5ba9fb919ad6f9f3db95343b6c3dcc8c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 2 Dec 2005 08:42:48 +0000 Subject: fix gcc4 (un)signed warnings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8124 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/Tremor/vorbisfile.c | 4 ++-- apps/codecs/aac.c | 4 ++-- apps/codecs/alac.c | 4 ++-- apps/codecs/dumb/src/it/itread.c | 12 ++++++------ apps/codecs/dumb/src/it/reads3m.c | 6 +++--- apps/codecs/libwavpack/unpack.c | 2 +- apps/codecs/mpa.c | 2 +- apps/codecs/shorten.c | 6 +++--- 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 @@ static long _get_data(OggVorbis_File *vf){ errno=0; if(vf->datasource){ - char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE); + char *buffer=(char *)ogg_sync_bufferin(vf->oy,CHUNKSIZE); long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource); if(bytes>0)ogg_sync_wrote(vf->oy,bytes); if(bytes==0 && errno)return(-1); @@ -682,7 +682,7 @@ static int _ov_open1(void *f,OggVorbis_File *vf,char *initial, previously read data (as we may be reading from a non-seekable stream) */ if(initial){ - char *buffer=ogg_sync_bufferin(vf->oy,ibytes); + char *buffer=(char *)ogg_sync_bufferin(vf->oy,ibytes); memcpy(buffer,initial,ibytes); ogg_sync_wrote(vf->oy,ibytes); } 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) /* Deal with any pending seek requests */ if (ci->seek_time) { - if (alac_seek(&demux_res,&input_stream, + if (alac_seek(&demux_res, &input_stream, ((ci->seek_time-1)/10) * (ci->id3->frequency/100), - &samplesdone, &i)) { + &samplesdone, (int *)&i)) { elapsedtime=(samplesdone*10)/(ci->id3->frequency/100); ci->set_elapsed(elapsedtime); } 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) /* Deal with any pending seek requests */ if (ci->seek_time) { - if (alac_seek(&demux_res,&input_stream, + if (alac_seek(&demux_res, &input_stream, ((ci->seek_time-1)/10) * (ci->id3->frequency/100), - &samplesdone, &i)) { + &samplesdone, (int *)&i)) { elapsedtime=(samplesdone*10)/(ci->id3->frequency/100); ci->set_elapsed(elapsedtime); } 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)); 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) WavpackStream *wps = &wpc->stream; if (wpmd->data) - bs_open_read (&wps->wvbits, wpmd->data, (char *) wpmd->data + wpmd->byte_length, NULL, 0); + bs_open_read (&wps->wvbits, wpmd->data, (unsigned char *) wpmd->data + wpmd->byte_length, NULL, 0); else if (wpmd->byte_length) bs_open_read (&wps->wvbits, wpc->read_buffer, wpc->read_buffer + sizeof (wpc->read_buffer), 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: inputbuffer = ci->request_buffer(&size, INPUT_CHUNK_SIZE); if (size == 0 || inputbuffer == NULL) break; - mad_stream_buffer(&stream, inputbuffer, size); + mad_stream_buffer(&stream, (unsigned char *)inputbuffer, size); } 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: /* Read the shorten & wave headers */ buf = ci->request_buffer(&bytesleft, MAX_FRAMESIZE); - res = shorten_init(&sc, buf, bytesleft); + res = shorten_init(&sc, (unsigned char *)buf, bytesleft); if (res < 0) { LOGF("shorten_init error: %d\n", res); return CODEC_ERROR; @@ -139,10 +139,10 @@ seek_start: ci->yield(); if (cur_chan == 0) { res = shorten_decode_frame(&sc, decoded0 + sc.nwrap, offset0, - buf, bytesleft); + (unsigned char *)buf, bytesleft); } else { res = shorten_decode_frame(&sc, decoded1 + sc.nwrap, offset1, - buf, bytesleft); + (unsigned char *)buf, bytesleft); } cur_chan++; -- cgit v1.2.3