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

archive/Plugin: return std::unique_ptr<ArchiveFile>

Browse Source
This commit is contained in:
Max Kellermann
2017-12-27 09:07:21 +01:00
parent 5a728a069e
commit 2e0949d8e6
8 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,13 +102,13 @@ Bzip2InputStream::Open()
/* archive open && listing routine */
static ArchiveFile *
static std::unique_ptr<ArchiveFile>
bz2_open(Path pathname)
{
static Mutex mutex;
static Cond cond;
auto is = OpenLocalInputStream(pathname, mutex, cond);
return new Bzip2ArchiveFile(pathname, std::move(is));
return std::make_unique<Bzip2ArchiveFile>(pathname, std::move(is));
}
/* single archive handling */

4
src/archive/plugins/Iso9660ArchivePlugin.cxx
View File

@@ -116,10 +116,10 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
_cdio_list_free (entlist, true);
}
static ArchiveFile *
static std::unique_ptr<ArchiveFile>
iso9660_archive_open(Path pathname)
{
return new Iso9660ArchiveFile(std::make_shared<Iso9660>(pathname));
return std::make_unique<Iso9660ArchiveFile>(std::make_shared<Iso9660>(pathname));
}
void

4
src/archive/plugins/ZzipArchivePlugin.cxx
View File

@@ -65,10 +65,10 @@ public:
/* archive open && listing routine */
static ArchiveFile *
static std::unique_ptr<ArchiveFile>
zzip_archive_open(Path pathname)
{
return new ZzipArchiveFile(std::make_shared<ZzipDir>(pathname));
return std::make_unique<ZzipArchiveFile>(std::make_shared<ZzipDir>(pathname));
}
inline void