diff options
| author | Max Kellermann <max@duempel.org> | 2013-11-23 18:45:02 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-11-23 18:45:02 +0100 |
| commit | 99527051b5751d2ef7c6b593f1beda84d1bcc33f (patch) | |
| tree | 39b08616c597fc173022164050ed557650c177b5 /src/archive | |
| parent | bed98303a346dd98e2a239579c032d170440441d (diff) | |
| parent | 57e0cc54424561499039967aa501c17d4b179019 (diff) | |
| download | mpd-99527051b5751d2ef7c6b593f1beda84d1bcc33f.tar.gz mpd-99527051b5751d2ef7c6b593f1beda84d1bcc33f.tar.xz mpd-99527051b5751d2ef7c6b593f1beda84d1bcc33f.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/archive')
| -rw-r--r-- | src/archive/Iso9660ArchivePlugin.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx index 8233d03f7..ad21d4a3d 100644 --- a/src/archive/Iso9660ArchivePlugin.cxx +++ b/src/archive/Iso9660ArchivePlugin.cxx @@ -190,18 +190,16 @@ iso9660_input_read(InputStream *is, void *ptr, size_t size, Error &error) { Iso9660InputStream *iis = (Iso9660InputStream *)is; - int toread, readed = 0; + int readed = 0; int no_blocks, cur_block; size_t left_bytes = iis->statbuf->size - is->offset; size = (size * ISO_BLOCKSIZE) / ISO_BLOCKSIZE; if (left_bytes < size) { - toread = left_bytes; no_blocks = CEILING(left_bytes,ISO_BLOCKSIZE); } else { - toread = size; - no_blocks = toread / ISO_BLOCKSIZE; + no_blocks = size / ISO_BLOCKSIZE; } if (no_blocks > 0) { |