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

input: wrap InputStream in std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann
2016-02-21 08:03:32 +01:00
parent 054e9ecaae
commit cadc67ea40
19 changed files with 107 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/archive/plugins/Bzip2ArchivePlugin.cxx
View File

@@ -49,22 +49,18 @@ public:
RefCount ref;
std::string name;
InputStream *const istream;
const InputStreamPtr istream;
Bzip2ArchiveFile(Path path, InputStream *_is)
Bzip2ArchiveFile(Path path, InputStreamPtr &&_is)
:ArchiveFile(bz2_archive_plugin),
name(path.GetBase().c_str()),
istream(_is) {
istream(std::move(_is)) {
// remove .bz2 suffix
const size_t len = name.length();
if (len > 4)
name.erase(len - 4);
}
~Bzip2ArchiveFile() {
delete istream;
}
void Ref() {
ref.Increment();
}
@@ -141,11 +137,11 @@ bz2_open(Path pathname, Error &error)
{
static Mutex mutex;
static Cond cond;
InputStream *is = OpenLocalInputStream(pathname, mutex, cond, error);
auto is = OpenLocalInputStream(pathname, mutex, cond, error);
if (is == nullptr)
return nullptr;
return new Bzip2ArchiveFile(pathname, is);
return new Bzip2ArchiveFile(pathname, std::move(is));
}
/* single archive handling */