oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/dsdlib: pass unsigned offsets to dsdlib_skip*()

Browse Source
This commit is contained in:
Max Kellermann 2014-07-09 19:39:10 +02:00
parent 56504534d8
commit 8759bc1b41
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/decoder/plugins/DsdLib.cxx
View File

@ -58,18 +58,18 @@ dsdlib_read(Decoder *decoder, InputStream &is,
*/ */
bool bool
dsdlib_skip_to(Decoder *decoder, InputStream &is, dsdlib_skip_to(Decoder *decoder, InputStream &is,
int64_t offset) uint64_t offset)
{ {
if (is.IsSeekable()) if (is.IsSeekable())
return is.Seek(offset, IgnoreError()); return is.Seek(offset, IgnoreError());
if (is.GetOffset() > offset) if (uint64_t(is.GetOffset()) > offset)
return false; return false;
char buffer[8192]; char buffer[8192];
while (is.GetOffset() < offset) { while (uint64_t(is.GetOffset()) < offset) {
size_t length = sizeof(buffer); size_t length = sizeof(buffer);
if (offset - is.GetOffset() < (int64_t)length) if (offset - is.GetOffset() < (uint64_t)length)
length = offset - is.GetOffset(); length = offset - is.GetOffset();
size_t nbytes = decoder_read(decoder, is, buffer, length); size_t nbytes = decoder_read(decoder, is, buffer, length);
@ -77,7 +77,7 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is,
return false; return false;
} }
assert(is.GetOffset() == offset); assert(uint64_t(is.GetOffset()) == offset);
return true; return true;
} }
@ -86,10 +86,8 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is,
*/ */
bool bool
dsdlib_skip(Decoder *decoder, InputStream &is, dsdlib_skip(Decoder *decoder, InputStream &is,
int64_t delta) uint64_t delta)
{ {
assert(delta >= 0);
if (delta == 0) if (delta == 0)
return true; return true;
@ -99,7 +97,7 @@ dsdlib_skip(Decoder *decoder, InputStream &is,
char buffer[8192]; char buffer[8192];
while (delta > 0) { while (delta > 0) {
size_t length = sizeof(buffer); size_t length = sizeof(buffer);
if ((int64_t)length > delta) if ((uint64_t)length > delta)
length = delta; length = delta;
size_t nbytes = decoder_read(decoder, is, buffer, length); size_t nbytes = decoder_read(decoder, is, buffer, length);

4
src/decoder/plugins/DsdLib.hxx
View File

@ -64,11 +64,11 @@ dsdlib_read(Decoder *decoder, InputStream &is,
bool bool
dsdlib_skip_to(Decoder *decoder, InputStream &is, dsdlib_skip_to(Decoder *decoder, InputStream &is,
int64_t offset); uint64_t offset);
bool bool
dsdlib_skip(Decoder *decoder, InputStream &is, dsdlib_skip(Decoder *decoder, InputStream &is,
int64_t delta); uint64_t delta);
/** /**
* Add tags from ID3 tag. All tags commonly found in the ID3 tags of * Add tags from ID3 tag. All tags commonly found in the ID3 tags of