First round of clang tidy changes

1 files changed, 9 insertions, 13 deletions

diff --git a/netfs/unittests/mockFuse.cpp b/netfs/unittests/mockFuse.cpp
index d7b66a6..9e9ac87 100644
--- a/netfs/unittests/mockFuse.cpp
+++ b/netfs/unittests/mockFuse.cpp
@@ -1,9 +1,9 @@
 #include "mockFuse.h"
 #include <boost/test/test_tools.hpp>
 
-FuseMock::FuseMock(const std::string & ep, const Ice::StringSeq & a) :
-	NetFS::FuseApp(a),
-	testEndpoint(ep)
+FuseMock::FuseMock(std::string ep, Ice::StringSeq a) :
+	NetFS::FuseApp(std::move(a)),
+	testEndpoint(std::move(ep))
 {
 	::memset(&context, 0, sizeof(fuse_context));
 	context.pid = getpid();
@@ -18,6 +18,7 @@ FuseMock::fuse_get_context()
 }
 
 int
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
 FuseMock::fuse_opt_parse(struct fuse_args * args, void * data, const struct fuse_opt [], fuse_opt_proc_t proc)
 {
 	for (int n = 0; n < args->argc; n += 1) {
@@ -29,7 +30,7 @@ FuseMock::fuse_opt_parse(struct fuse_args * args, void * data, const struct fuse
 int
 FuseMock::main(int, char **, const struct fuse_operations * o)
 {
-	o->init(NULL);
+	o->init(nullptr);
 	ops = *o;
 	return 0;
 }
@@ -47,24 +48,19 @@ FuseMock::ReadConfiguration(const std::filesystem::path & path) const
 }
 
 void
-FuseMock::vlogf(int, const char * fmt, va_list args) const throw()
+FuseMock::vlogf(int, const char * fmt, va_list args) const noexcept
 {
 	BOOST_TEST_MESSAGE(vstringf(fmt, args));
 }
 
-FuseMockHost::FuseMockHost(const std::string & ep, const Ice::StringSeq & a) :
-	app(new FuseMock(ep, a)),
+FuseMockHost::FuseMockHost(std::string ep, const Ice::StringSeq & a) :
+	app(std::make_unique<FuseMock>(std::move(ep), a)),
 	fuse(&app->ops)
 {
 	std::vector<char *> argv;
 	for (auto & arg : a) {
 		argv.push_back(const_cast<char *>(arg.c_str()));
 	}
-	FuseAppBase::run(a.size(), &argv.front(), app);
-}
-
-FuseMockHost::~FuseMockHost()
-{
-	delete app;
+	FuseAppBase::run(a.size(), &argv.front(), app.get());
 }