First round of clang tidy changes

9 files changed, 13 insertions, 36 deletions

diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp
index 27dfbb9..2962ede 100644
--- a/netfs/daemon/daemon.cpp
+++ b/netfs/daemon/daemon.cpp
@@ -7,10 +7,6 @@
 #include <sys/stat.h>
 #include <safeMapFind.h>
 
-NetFSDaemon::NetFSDaemon()
-{
-}
-
 NetFSDaemon::~NetFSDaemon()
 {
 	if (adapter) {
@@ -24,8 +20,8 @@ NetFSDaemon::hostname()
 	auto props = ic->getProperties();
 	auto hostNameOverride = props->getProperty("NetFSD.HostNameOverride");
 	if (hostNameOverride.empty()) {
-		char buf[128];
-		gethostname(buf, sizeof(buf));
+		std::string buf(128, 0);
+		gethostname(buf.data(), buf.size());
 		return buf;
 	}
 	return hostNameOverride;
diff --git a/netfs/daemon/daemon.h b/netfs/daemon/daemon.h
index 57e2023..bc12973 100644
--- a/netfs/daemon/daemon.h
+++ b/netfs/daemon/daemon.h
@@ -9,7 +9,6 @@
 
 class DLL_PUBLIC NetFSDaemon : public IceBox::Service {
 	public:
-		NetFSDaemon();
 		virtual ~NetFSDaemon();
 
 		virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) override;
diff --git a/netfs/daemon/daemonDirectory.cpp b/netfs/daemon/daemonDirectory.cpp
index b03bd1f..44aa765 100644
--- a/netfs/daemon/daemonDirectory.cpp
+++ b/netfs/daemon/daemonDirectory.cpp
@@ -1,6 +1,6 @@
 #include <Ice/ObjectAdapter.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <map>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -13,10 +13,6 @@ DirectoryServer::DirectoryServer(DIR * d, EntryTypeConverter & t) :
 {
 }
 
-DirectoryServer::~DirectoryServer()
-{
-}
-
 void
 DirectoryServer::close(const Ice::Current & ice)
 {
diff --git a/netfs/daemon/daemonDirectory.h b/netfs/daemon/daemonDirectory.h
index 5e549fe..b4da8f2 100644
--- a/netfs/daemon/daemonDirectory.h
+++ b/netfs/daemon/daemonDirectory.h
@@ -8,7 +8,6 @@
 class DirectoryServer : public NetFS::DirectoryV2, EntryTypeConverter {
 	public:
 		DirectoryServer(DIR * od, EntryTypeConverter &);
-		virtual ~DirectoryServer();
 
 		virtual void close(const Ice::Current&) override;
 		virtual NetFS::NameList readdir(const Ice::Current&) override;
diff --git a/netfs/daemon/daemonFile.cpp b/netfs/daemon/daemonFile.cpp
index 0df3c2a..1113904 100644
--- a/netfs/daemon/daemonFile.cpp
+++ b/netfs/daemon/daemonFile.cpp
@@ -1,5 +1,5 @@
 #include <Ice/ObjectAdapter.h>
-#include <errno.h>
+#include <cerrno>
 #include <map>
 #include <fcntl.h>
 #include <typeConverter.h>
@@ -13,10 +13,6 @@ FileServer::FileServer(int f, EntryTypeConverter & t) :
 {
 }
 
-FileServer::~FileServer()
-{
-}
-
 void
 FileServer::ftruncate(const NetFS::ReqEnv re, Ice::Long size, const Ice::Current&)
 {
diff --git a/netfs/daemon/daemonFile.h b/netfs/daemon/daemonFile.h
index 9a01abf..ee4ae7d 100644
--- a/netfs/daemon/daemonFile.h
+++ b/netfs/daemon/daemonFile.h
@@ -7,7 +7,6 @@
 class FileServer : public NetFS::File, EntryTypeConverter {
 	public:
 		FileServer(int fd, EntryTypeConverter &);
-		virtual ~FileServer();
 
 		virtual void close(const Ice::Current&) override;
 		virtual void ftruncate(const NetFS::ReqEnv, Ice::Long size, const Ice::Current&) override;
diff --git a/netfs/daemon/daemonService.cpp b/netfs/daemon/daemonService.cpp
index a516cb2..30dac0a 100644
--- a/netfs/daemon/daemonService.cpp
+++ b/netfs/daemon/daemonService.cpp
@@ -4,7 +4,7 @@
 #include <safeMapFind.h>
 
 ServiceServer::ServiceServer(NetFS::Daemon::ConfigurationPtr c) :
-	config(c)
+	config(std::move(c))
 {
 }
 
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp
index 1a3680f..fd2f895 100644
--- a/netfs/daemon/daemonVolume.cpp
+++ b/netfs/daemon/daemonVolume.cpp
@@ -1,9 +1,9 @@
 #include <Ice/ObjectAdapter.h>
-#include <errno.h>
+#include <cerrno>
 #include <map>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <limits.h>
+#include <climits>
 #include <fcntl.h>
 #include "daemonVolume.h"
 #include "daemonFile.h"
@@ -23,10 +23,6 @@ VolumeServer::VolumeServer(const std::filesystem::path & r, const EntCache<User>
 {
 }
 
-VolumeServer::~VolumeServer()
-{
-}
-
 void
 VolumeServer::disconnect(const Ice::Current & ice)
 {
@@ -135,14 +131,15 @@ VolumeServer::readlink(const NetFS::ReqEnv re, const std::string path, const Ice
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
-	char buf[PATH_MAX];
+	std::string buf(PATH_MAX, 0);
 	std::filesystem::path p(resolvePath(std::move(path)));
 	mc.AssertRead(p);
-	ssize_t rc = ::readlink(p.c_str(), buf, PATH_MAX);
+	ssize_t rc = ::readlink(p.c_str(), buf.data(), PATH_MAX);
 	if (rc == -1) {
 		throw NetFS::SystemError(errno);
 	}
-	return std::string(buf, rc);
+	buf.resize(rc);
+	return buf;
 }
 
 void
@@ -175,14 +172,10 @@ VolumeServer::utimens(const NetFS::ReqEnv re, const std::string path,
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
-	struct timespec times[2];
-	times[0].tv_sec = s0;
-	times[0].tv_nsec = ns0;
-	times[1].tv_sec = s1;
-	times[1].tv_nsec = ns1;
+	std::array<struct timespec, 2> times { { { s0, ns0 }, { s1, ns1 } } };
 	std::filesystem::path p(resolvePath(std::move(path)));
 	mc.AssertWrite(p);
-	if (::utimensat(0, p.c_str(), times, AT_SYMLINK_NOFOLLOW) != 0) {
+	if (::utimensat(0, p.c_str(), times.data(), AT_SYMLINK_NOFOLLOW) != 0) {
 		throw NetFS::SystemError(errno);
 	}
 }
diff --git a/netfs/daemon/daemonVolume.h b/netfs/daemon/daemonVolume.h
index 6e29893..5087654 100644
--- a/netfs/daemon/daemonVolume.h
+++ b/netfs/daemon/daemonVolume.h
@@ -10,7 +10,6 @@
 class VolumeServer : public NetFS::Volume {
 	public:
 		VolumeServer(const std::filesystem::path & root, const EntCache<User> &, const EntCache<Group> &);
-		virtual ~VolumeServer();
 
 		virtual NetFS::DirectoryPrxPtr opendir(const NetFS::ReqEnv, const std::string path, const Ice::Current&) override;