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

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

View File

@ -19,11 +19,12 @@
#include "config.h"
#include "ArchivePlugin.hxx"
#include "ArchiveFile.hxx"
#include "fs/Path.hxx"
#include <assert.h>
ArchiveFile *
std::unique_ptr<ArchiveFile>
archive_file_open(const ArchivePlugin *plugin, Path path)
{
assert(plugin != nullptr);

View File

@ -20,6 +20,8 @@
#ifndef MPD_ARCHIVE_PLUGIN_HXX
#define MPD_ARCHIVE_PLUGIN_HXX
#include <memory>
class ArchiveFile;
class Path;
@ -45,7 +47,7 @@ struct ArchivePlugin {
*
* Throws std::runtime_error on error.
*/
ArchiveFile *(*open)(Path path_fs);
std::unique_ptr<ArchiveFile> (*open)(Path path_fs);
/**
* suffixes handled by this plugin.
@ -54,7 +56,7 @@ struct ArchivePlugin {
const char *const*suffixes;
};
ArchiveFile *
std::unique_ptr<ArchiveFile>
archive_file_open(const ArchivePlugin *plugin, Path path);
#endif

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 */

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

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

View File

@ -150,7 +150,7 @@ UpdateWalk::UpdateArchiveFile(Directory &parent, const char *name,
return;
/* open archive */
ArchiveFile *file;
std::unique_ptr<ArchiveFile> file;
try {
file = archive_file_open(&plugin, path_fs);
} catch (...) {
@ -177,7 +177,6 @@ UpdateWalk::UpdateArchiveFile(Directory &parent, const char *name,
UpdateArchiveVisitor visitor(*this, *file, directory);
file->Visit(visitor);
delete file;
}
bool

View File

@ -60,13 +60,8 @@ OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond)
return nullptr;
}
auto file = archive_file_open(arplug, Path::FromFS(archive));
AtScopeExit(file) {
delete file;
};
return file->OpenStream(filename, mutex, cond);
return archive_file_open(arplug, Path::FromFS(archive))
->OpenStream(filename, mutex, cond);
}
static InputStreamPtr

View File

@ -89,11 +89,10 @@ try {
int result = EXIT_SUCCESS;
ArchiveFile *file = archive_file_open(plugin, path);
auto file = archive_file_open(plugin, path);
MyArchiveVisitor visitor;
file->Visit(visitor);
delete file;
return result;
} catch (const std::exception &e) {