From bd8e6f90e57aef729a590d8cbaf6e545439bee26 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 31 Jul 2022 20:26:55 +0100 Subject: Allow passedByValue on ICE interface implementations --- netfs/daemon/daemonService.cpp | 1 + netfs/daemon/daemonService.h | 1 + netfs/daemon/daemonVolume.cpp | 16 ++++++++++++++++ netfs/daemon/daemonVolume.h | 2 ++ 4 files changed, 20 insertions(+) diff --git a/netfs/daemon/daemonService.cpp b/netfs/daemon/daemonService.cpp index 03f60be..93d48a8 100644 --- a/netfs/daemon/daemonService.cpp +++ b/netfs/daemon/daemonService.cpp @@ -11,6 +11,7 @@ ServiceServer::ServiceServer(NetFS::Daemon::ConfigurationPtr c) : } NetFS::VolumePrxPtr +// cppcheck-suppress passedByValue; ServiceServer::connect(const std::string share, const std::string authtoken, const Ice::Current & ice) { const auto & ex = AdHoc::safeMapLookup(config->Exports, share); diff --git a/netfs/daemon/daemonService.h b/netfs/daemon/daemonService.h index 1b240c2..e796dc5 100644 --- a/netfs/daemon/daemonService.h +++ b/netfs/daemon/daemonService.h @@ -9,6 +9,7 @@ class ServiceServer : public NetFS::Service { public: explicit ServiceServer(NetFS::Daemon::ConfigurationPtr c); + // cppcheck-suppress passedByValue; NetFS::VolumePrxPtr connect(const std::string share, const std::string auth, const Ice::Current &) override; NetFS::SettingsPtr getSettings(const Ice::Current &) override; diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 0384015..ab2f0fe 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -31,6 +31,7 @@ VolumeServer::disconnect(const Ice::Current & ice) } Ice::Int +// cppcheck-suppress passedByValue; VolumeServer::access(const NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -57,6 +58,7 @@ VolumeServer::access(const NetFS::ReqEnv re, std::string path, Ice::Int mode, co } NetFS::Attr +// cppcheck-suppress passedByValue; VolumeServer::getattr(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -70,6 +72,7 @@ VolumeServer::getattr(const NetFS::ReqEnv re, std::string path, const Ice::Curre } void +// cppcheck-suppress passedByValue; VolumeServer::mknod(const NetFS::ReqEnv re, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -98,6 +101,7 @@ VolumeServer::symlink(const NetFS::ReqEnv re, const std::string path1, std::stri } void +// cppcheck-suppress passedByValue; VolumeServer::link(const NetFS::ReqEnv re, std::string path1, std::string path2, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -132,6 +136,7 @@ VolumeServer::rename(const NetFS::ReqEnv re, std::string from, std::string to, c } std::string +// cppcheck-suppress passedByValue; VolumeServer::readlink(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -148,6 +153,7 @@ VolumeServer::readlink(const NetFS::ReqEnv re, std::string path, const Ice::Curr } void +// cppcheck-suppress passedByValue; VolumeServer::chmod(const NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -160,6 +166,7 @@ VolumeServer::chmod(const NetFS::ReqEnv re, std::string path, Ice::Int mode, con } void +// cppcheck-suppress passedByValue; VolumeServer::chown(const NetFS::ReqEnv re, std::string path, Ice::Int uid, Ice::Int gid, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -172,6 +179,7 @@ VolumeServer::chown(const NetFS::ReqEnv re, std::string path, Ice::Int uid, Ice: } void +// cppcheck-suppress passedByValue; VolumeServer::utimens(const NetFS::ReqEnv re, std::string path, Ice::Long s0, Ice::Long ns0, Ice::Long s1, Ice::Long ns1, const Ice::Current &) { @@ -186,6 +194,7 @@ VolumeServer::utimens(const NetFS::ReqEnv re, std::string path, Ice::Long s0, Ic } NetFS::VFS +// cppcheck-suppress passedByValue; VolumeServer::statfs(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -200,6 +209,7 @@ VolumeServer::statfs(const NetFS::ReqEnv re, std::string path, const Ice::Curren } void +// cppcheck-suppress passedByValue; VolumeServer::truncate(const NetFS::ReqEnv re, std::string path, Ice::Long size, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -212,6 +222,7 @@ VolumeServer::truncate(const NetFS::ReqEnv re, std::string path, Ice::Long size, } void +// cppcheck-suppress passedByValue; VolumeServer::unlink(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -224,6 +235,7 @@ VolumeServer::unlink(const NetFS::ReqEnv re, std::string path, const Ice::Curren } NetFS::FilePrxPtr +// cppcheck-suppress passedByValue; VolumeServer::open(const NetFS::ReqEnv re, std::string path, Ice::Int flags, const Ice::Current & ice) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -242,6 +254,7 @@ VolumeServer::open(const NetFS::ReqEnv re, std::string path, Ice::Int flags, con } NetFS::FilePrxPtr +// cppcheck-suppress passedByValue; VolumeServer::create(const NetFS::ReqEnv re, std::string path, Ice::Int flags, Ice::Int mode, const Ice::Current & ice) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -262,6 +275,7 @@ VolumeServer::create(const NetFS::ReqEnv re, std::string path, Ice::Int flags, I } NetFS::DirectoryPrxPtr +// cppcheck-suppress passedByValue; VolumeServer::opendir(const NetFS::ReqEnv re, std::string path, const Ice::Current & ice) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -277,6 +291,7 @@ VolumeServer::opendir(const NetFS::ReqEnv re, std::string path, const Ice::Curre } void +// cppcheck-suppress passedByValue; VolumeServer::mkdir(const NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); @@ -293,6 +308,7 @@ VolumeServer::mkdir(const NetFS::ReqEnv re, std::string path, Ice::Int mode, con } void +// cppcheck-suppress passedByValue; VolumeServer::rmdir(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); diff --git a/netfs/daemon/daemonVolume.h b/netfs/daemon/daemonVolume.h index 8fdf670..d7f7c1b 100644 --- a/netfs/daemon/daemonVolume.h +++ b/netfs/daemon/daemonVolume.h @@ -29,8 +29,10 @@ public: Ice::Int access(const NetFS::ReqEnv, std::string path, Ice::Int mode, const Ice::Current &) override; NetFS::Attr getattr(const NetFS::ReqEnv, std::string path, const Ice::Current &) override; void mknod(const NetFS::ReqEnv, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current &) override; + // cppcheck-suppress passedByValue; void symlink(const NetFS::ReqEnv, const std::string path1, const std::string path2, const Ice::Current &) override; void link(const NetFS::ReqEnv, std::string path1, std::string path2, const Ice::Current &) override; + // cppcheck-suppress passedByValue; void rename(const NetFS::ReqEnv, std::string path1, const std::string path2, const Ice::optional, const Ice::Current &) override; std::string readlink(const NetFS::ReqEnv, std::string path, const Ice::Current &) override; -- cgit v1.2.3