summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2019-09-24 21:03:13 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2019-09-24 23:13:15 +0100
commitf93faf23d994f3a9c86d4e44f7e262699ba0de2a (patch)
treecf922c4b237d02a30c08b5387f5a5ca48c45b2f3
parentRevise fuse_ls test to test cache hits (diff)
downloadnetfs-f93faf23d994f3a9c86d4e44f7e262699ba0de2a.tar.bz2
netfs-f93faf23d994f3a9c86d4e44f7e262699ba0de2a.tar.xz
netfs-f93faf23d994f3a9c86d4e44f7e262699ba0de2a.zip
Minor fixups
-rw-r--r--netfs/daemon/daemonVolume.cpp2
-rw-r--r--netfs/daemon/daemonVolume.h2
-rw-r--r--netfs/unittests/testFuse.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp
index dc16011..bdd899b 100644
--- a/netfs/daemon/daemonVolume.cpp
+++ b/netfs/daemon/daemonVolume.cpp
@@ -323,7 +323,7 @@ normalizedAppend(std::filesystem::path out, const std::filesystem::path && in)
}
std::filesystem::path
-VolumeServer::resolvePath(std::string path) const
+VolumeServer::resolvePath(std::string && path) const
{
return normalizedAppend(root, std::move(path));
}
diff --git a/netfs/daemon/daemonVolume.h b/netfs/daemon/daemonVolume.h
index 190f146..770cada 100644
--- a/netfs/daemon/daemonVolume.h
+++ b/netfs/daemon/daemonVolume.h
@@ -39,7 +39,7 @@ class VolumeServer : public NetFS::Volume {
virtual void disconnect(const Ice::Current&) override;
protected:
- std::filesystem::path resolvePath(std::string path) const;
+ inline std::filesystem::path resolvePath(std::string && path) const;
private:
const std::filesystem::path root;
diff --git a/netfs/unittests/testFuse.cpp b/netfs/unittests/testFuse.cpp
index 80a33a8..2abe1f2 100644
--- a/netfs/unittests/testFuse.cpp
+++ b/netfs/unittests/testFuse.cpp
@@ -77,10 +77,10 @@ class FuseMountPoint : public MockDaemonHost, public NetFS::FuseApp {
};
#define BOOST_CHECK_EQUAL_FIELD(left, right, field) \
- BOOST_CHECK_EQUAL(left.field, right.field);
+ BOOST_CHECK_EQUAL((left).field, (right).field);
#define BOOST_CHECK_EQUAL_STAT(left, right) \
- BOOST_CHECK_NE(&left, &right); \
+ BOOST_CHECK_NE(&(left), &(right)); \
BOOST_CHECK_EQUAL_FIELD(left, right, st_atim.tv_sec); \
BOOST_CHECK_EQUAL_FIELD(left, right, st_mtim.tv_sec); \
BOOST_CHECK_EQUAL_FIELD(left, right, st_ctim.tv_sec); \