diff options
| -rw-r--r-- | mythfs/service/openDirectory.h | 2 | ||||
| -rw-r--r-- | mythfs/service/recordingsVolume.cpp | 4 | ||||
| -rw-r--r-- | mythfs/service/recordingsVolume.h | 2 | ||||
| -rw-r--r-- | mythfs/unittests/testMain.cpp | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/mythfs/service/openDirectory.h b/mythfs/service/openDirectory.h index db0f1f6..cd6e200 100644 --- a/mythfs/service/openDirectory.h +++ b/mythfs/service/openDirectory.h @@ -5,7 +5,7 @@ #include "inodes/node.h" namespace MythFS { - class OpenDirectory : public ::NetFS::DirectoryV2 { + class OpenDirectory : public ::NetFS::Directory { public: OpenDirectory(Node::PointerType); diff --git a/mythfs/service/recordingsVolume.cpp b/mythfs/service/recordingsVolume.cpp index 7529b9b..34ebbb8 100644 --- a/mythfs/service/recordingsVolume.cpp +++ b/mythfs/service/recordingsVolume.cpp @@ -21,7 +21,7 @@ namespace MythFS { RecordingsVolume::opendir(const NetFS::ReqEnv, const std::string p, const Ice::Current & ic) { return Ice::uncheckedCast<::NetFS::DirectoryPrx>( - ic.adapter->addFacetWithUUID(std::make_shared<OpenDirectory>(resolvePath(p)), "v02")); + ic.adapter->addWithUUID(std::make_shared<OpenDirectory>(resolvePath(p)))); } void RecordingsVolume::mkdir(const NetFS::ReqEnv, const std::string, Ice::Int, const Ice::Current&) { @@ -89,7 +89,7 @@ namespace MythFS { throw ::NetFS::SystemError(ENOSYS); } - void RecordingsVolume::rename(const NetFS::ReqEnv, const std::string, const std::string, const Ice::Current&) + void RecordingsVolume::rename(const NetFS::ReqEnv, const std::string, const std::string, Ice::optional<Ice::Int>, const Ice::Current&) { throw ::NetFS::SystemError(ENOSYS); } diff --git a/mythfs/service/recordingsVolume.h b/mythfs/service/recordingsVolume.h index 8def17a..2ba30ca 100644 --- a/mythfs/service/recordingsVolume.h +++ b/mythfs/service/recordingsVolume.h @@ -30,7 +30,7 @@ namespace MythFS { virtual void mknod(const NetFS::ReqEnv, const std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current&) override; virtual void symlink(const NetFS::ReqEnv, const std::string path1, const std::string path2, const Ice::Current&) override; virtual void link(const NetFS::ReqEnv, const std::string path1, const std::string path2, const Ice::Current&) override; - virtual void rename(const NetFS::ReqEnv, const std::string path1, const std::string path2, const Ice::Current&) override; + virtual void rename(const NetFS::ReqEnv, const std::string path1, const std::string path2, Ice::optional<Ice::Int>, const Ice::Current&) override; virtual std::string readlink(const NetFS::ReqEnv, const std::string path, const Ice::Current&) override; virtual void chmod(const NetFS::ReqEnv, const std::string path, Ice::Int mode, const Ice::Current&) override; virtual void chown(const NetFS::ReqEnv, const std::string path, Ice::Int uid, Ice::Int gid, const Ice::Current&) override; diff --git a/mythfs/unittests/testMain.cpp b/mythfs/unittests/testMain.cpp index fef347a..1a87aed 100644 --- a/mythfs/unittests/testMain.cpp +++ b/mythfs/unittests/testMain.cpp @@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE( unsupportedOperations ) BOOST_REQUIRE_THROW(rv->mknod(re, "/file", 0, 0), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->symlink(re, "/file", "/somewhere"), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->link(re, "/file", "/somewhere"), NetFS::SystemError); - BOOST_REQUIRE_THROW(rv->rename(re, "/file", "/somewhere"), NetFS::SystemError); + BOOST_REQUIRE_THROW(rv->rename(re, "/file", "/somewhere", 0), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->chmod(re, "/", 0600), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->chown(re, "/", 0, 0), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->utimens(re, "/", 0, 0, 0, 0), NetFS::SystemError); @@ -114,8 +114,7 @@ BOOST_AUTO_TEST_CASE( listRoot ) BOOST_REQUIRE_EQUAL("by date", ls[1]); BOOST_REQUIRE_EQUAL("by title", ls[2]); - auto d2 = Ice::uncheckedCast<NetFS::DirectoryV2Prx>(d); - auto ls2 = d2->listdir(); + auto ls2 = d->listdir(); BOOST_REQUIRE_EQUAL(3, ls2.size()); BOOST_REQUIRE_EQUAL(defaultDirMode, ls2["all"].mode); BOOST_REQUIRE_EQUAL(defaultDirMode, ls2["by date"].mode); |