Skip to content

M
mpd
Commit c95d068e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

archive/iso9660: use reference instead of pointer

parent dbda35ff
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/archive/Iso9660ArchivePlugin.cxx
View file @ c95d068e
...@@ -142,7 +142,7 @@ Iso9660ArchiveFile::Visit(ArchiveVisitor &visitor) ...@@ -142,7 +142,7 @@ Iso9660ArchiveFile::Visit(ArchiveVisitor &visitor)
class Iso9660InputStream { class Iso9660InputStream {
InputStream base; InputStream base;
Iso9660ArchiveFile *archive; Iso9660ArchiveFile &archive;
iso9660_stat_t *statbuf; iso9660_stat_t *statbuf;
...@@ -151,16 +151,16 @@ public: ...@@ -151,16 +151,16 @@ public:
Mutex &mutex, Cond &cond, Mutex &mutex, Cond &cond,
iso9660_stat_t *_statbuf) iso9660_stat_t *_statbuf)
:base(iso9660_input_plugin, uri, mutex, cond), :base(iso9660_input_plugin, uri, mutex, cond),
archive(&_archive), statbuf(_statbuf) { archive(_archive), statbuf(_statbuf) {
base.ready = true; base.ready = true;
base.size = statbuf->size; base.size = statbuf->size;
archive->Ref(); archive.Ref();
} }
~Iso9660InputStream() { ~Iso9660InputStream() {
free(statbuf); free(statbuf);
archive->Unref(); archive.Unref();
} }
InputStream *Get() { InputStream *Get() {
...@@ -216,8 +216,8 @@ Iso9660InputStream::Read(void *ptr, size_t size, Error &error) ...@@ -216,8 +216,8 @@ Iso9660InputStream::Read(void *ptr, size_t size, Error &error)
cur_block = base.offset / ISO_BLOCKSIZE; cur_block = base.offset / ISO_BLOCKSIZE;
readed = archive->SeekRead(ptr, statbuf->lsn + cur_block, readed = archive.SeekRead(ptr, statbuf->lsn + cur_block,
no_blocks); no_blocks);
if (readed != no_blocks * ISO_BLOCKSIZE) { if (readed != no_blocks * ISO_BLOCKSIZE) {
error.Format(iso9660_domain, error.Format(iso9660_domain,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment