To support this change, turn on lots more compiler warnings, and fix all the warnings generated.
Showing the changes to src/flac.c (1 of 93 files). Show all
Unified · Split
| @@ -58,8 +58,7 @@ static void FLAC__decoder_metadata_callback(FLAC__FileDecoder const * const flac · 57 unmodified lines | ||
| 58 | 58 | } |
| 59 | 59 | else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) |
| 60 | 60 | { |
| 61 | − int i; | |
| 62 | − int comment_size = 0; | |
| 61 | + size_t i, comment_size = 0; | |
| 63 | 62 | |
| 64 | 63 | if (metadata->data.vorbis_comment.num_comments == 0) |
| 65 | 64 | { |
| @@ -176,10 +175,10 @@ static int st_format_start_read(ft_t const format) · 110 unmodified lines | ||
| 176 | 175 | } |
| 177 | 176 | |
| 178 | 177 | |
| 179 | −static st_ssize_t st_format_read(ft_t const format, st_sample_t * sampleBuffer, st_size_t const requested) | |
| 178 | +static st_size_t st_format_read(ft_t const format, st_sample_t * sampleBuffer, st_size_t const requested) | |
| 180 | 179 | { |
| 181 | 180 | Decoder * decoder = (Decoder *) format->priv; |
| 182 | − int actual = 0; | |
| 181 | + size_t actual = 0; | |
| 183 | 182 | |
| 184 | 183 | while (!decoder->eof && actual < requested) |
| 185 | 184 | { |
| @@ -247,7 +246,7 @@ assert_static(sizeof(Encoder) <= ST_MAX_FILE_PRIVSIZE, /* else */ Encoder__PRIVS · 61 unmodified lines | ||
| 247 | 246 | |
| 248 | 247 | |
| 249 | 248 | |
| 250 | −FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(FLAC__StreamEncoder const * const flac, const FLAC__byte buffer[], unsigned const bytes, unsigned const samples, unsigned const current_frame, void * const client_data) | |
| 249 | +static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(FLAC__StreamEncoder const * const flac, const FLAC__byte buffer[], unsigned const bytes, unsigned const samples, unsigned const current_frame, void * const client_data) | |
| 251 | 250 | { |
| 252 | 251 | ft_t const format = (ft_t) client_data; |
| 253 | 252 | (void) flac, (void) samples, (void) current_frame; |
| @@ -257,7 +256,7 @@ FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(FLAC__StreamEn · 3 unmodified lines | ||
| 257 | 256 | |
| 258 | 257 | |
| 259 | 258 | |
| 260 | −void flac_stream_encoder_metadata_callback(FLAC__StreamEncoder const * encoder, FLAC__StreamMetadata const * metadata, void * client_data) | |
| 259 | +static void flac_stream_encoder_metadata_callback(FLAC__StreamEncoder const * encoder, FLAC__StreamMetadata const * metadata, void * client_data) | |
| 261 | 260 | { |
| 262 | 261 | (void) encoder, (void) metadata, (void) client_data; |
| 263 | 262 | } |
| @@ -341,7 +340,7 @@ static int st_format_start_write(ft_t const format) · 77 unmodified lines | ||
| 341 | 340 | { /* Check if rate is streamable: */ |
| 342 | 341 | static const unsigned streamable_rates[] = |
| 343 | 342 | {8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000}; |
| 344 | − int i; | |
| 343 | + size_t i; | |
| 345 | 344 | bool streamable = false; |
| 346 | 345 | for (i = 0; !streamable && i < array_length(streamable_rates); ++i) |
| 347 | 346 | { |
| @@ -356,7 +355,7 @@ static int st_format_start_write(ft_t const format) · 8 unmodified lines | ||
| 356 | 355 | |
| 357 | 356 | if (format->length != 0) |
| 358 | 357 | { |
| 359 | − FLAC__stream_encoder_set_total_samples_estimate(encoder->flac, format->length); | |
| 358 | + FLAC__stream_encoder_set_total_samples_estimate(encoder->flac, (FLAC__uint64)format->length); | |
| 360 | 359 | } |
| 361 | 360 | |
| 362 | 361 | if (format->comment != NULL && * format->comment != '\0') |
| @@ -423,7 +422,7 @@ static int st_format_start_write(ft_t const format) · 60 unmodified lines | ||
| 423 | 422 | |
| 424 | 423 | |
| 425 | 424 | |
| 426 | −static st_ssize_t st_format_write(ft_t const format, st_sample_t const * const sampleBuffer, st_size_t const len) | |
| 425 | +static st_size_t st_format_write(ft_t const format, st_sample_t const * const sampleBuffer, st_size_t const len) | |
| 427 | 426 | { |
| 428 | 427 | Encoder * encoder = (Encoder *) format->priv; |
| 429 | 428 | unsigned i; |
| @@ -439,7 +438,7 @@ static st_ssize_t st_format_write(ft_t const format, st_sample_t const * const s · 9 unmodified lines | ||
| 439 | 438 | } |
| 440 | 439 | } |
| 441 | 440 | FLAC__stream_encoder_process_interleaved(encoder->flac, encoder->decoded_samples, len / format->info.channels); |
| 442 | − return FLAC__stream_encoder_get_state(encoder->flac) == FLAC__STREAM_ENCODER_OK ? len : -1; | |
| 441 | + return FLAC__stream_encoder_get_state(encoder->flac) == FLAC__STREAM_ENCODER_OK ? len : 0; | |
| 443 | 442 | } |
| 444 | 443 | |
| 445 | 444 | |