X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpacksource.cpp;h=0fb64843b305edd8839a4e93bf1bb04c9c3f33de;hb=e14c01b5775dd2e324b16ff49498db9b9113c523;hp=b2fb17abc5ae9393feabf2f223130b547a3c072e;hpb=256b44a5009467171af53316141277027bcc0ba4;p=libs%2Fdatafile.git diff --git a/source/packsource.cpp b/source/packsource.cpp index b2fb17a..0fb6484 100644 --- a/source/packsource.cpp +++ b/source/packsource.cpp @@ -51,7 +51,7 @@ void PackSource::add_pack_file(const string &fn) void PackSource::add_pack_file(const string &fn, const string &filter) { - add_pack(0, fn, filter); + add_pack(nullptr, fn, filter); } void PackSource::add_pack_io(IO::Seekable &io, const string &fn) @@ -155,14 +155,13 @@ IO::Seekable *PackSource::open(const string &fn) const if(i!=files.end()) return i->second->open().release(); - return 0; + return nullptr; } PackSource::Pack::Pack(IO::Seekable *i, const string &fn): filename(fn), - io(i), - base_offset(0) + io(i) { } PackSource::Pack::Pack(const Pack &other): @@ -203,10 +202,7 @@ void PackSource::Pack::translate_files(FileMap &fm, const Pack &source) const PackSource::File::File(const Pack &p, const string &fn): pack(p), - filename(fn), - offset(0), - length(0), - collection(false) + filename(fn) { } PackSource::File::File(const File &other, const Pack &p):