diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-24 19:14:40 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-26 01:24:01 +0100 |
| commit | 0273cd44b0b50d5d320ce88cc1472e0d8ee8e529 (patch) | |
| tree | 7c493850ab07deddd637ca0b5e8b3476e40a68fc /src/decoder/dsf_decoder_plugin.c | |
| parent | 3203a7dd8ce8db6afcc54d68d63b4f4af7dc4c7f (diff) | |
input_stream: forward-declare the struct
Hide the definition from C code, to prepare the transition to C++.
Diffstat (limited to 'src/decoder/dsf_decoder_plugin.c')
| -rw-r--r-- | src/decoder/dsf_decoder_plugin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/decoder/dsf_decoder_plugin.c b/src/decoder/dsf_decoder_plugin.c index 6700f739..23576a62 100644 --- a/src/decoder/dsf_decoder_plugin.c +++ b/src/decoder/dsf_decoder_plugin.c @@ -165,14 +165,15 @@ dsf_read_metadata(struct decoder *decoder, struct input_stream *is, metadata->chunk_size = data_size; /* data_size cannot be bigger or equal to total file size */ - if (data_size >= (unsigned) is->size) + const uint64_t size = (uint64_t)input_stream_get_size(is); + if (data_size >= size) return false; metadata->channels = (unsigned) dsf_fmt_chunk.channelnum; metadata->sample_rate = samplefreq; #ifdef HAVE_ID3TAG /* metada_offset cannot be bigger then or equal to total file size */ - if (metadata_offset >= (unsigned) is->size) + if (metadata_offset >= size) metadata->id3_offset = 0; else metadata->id3_offset = (goffset) metadata_offset; |