From 4596d9ba25b4d0b2ddb430ff43bc3b5a646cd78f Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 14 Feb 2016 20:34:33 +0000 Subject: Remove the only parts in keeping with NetFS --- mythfs/service/recordingsVolume.cpp | 5 ----- mythfs/service/recordingsVolume.h | 1 - mythfs/unittests/testMain.cpp | 1 - 3 files changed, 7 deletions(-) diff --git a/mythfs/service/recordingsVolume.cpp b/mythfs/service/recordingsVolume.cpp index ff29787..c4ddbc2 100644 --- a/mythfs/service/recordingsVolume.cpp +++ b/mythfs/service/recordingsVolume.cpp @@ -48,11 +48,6 @@ namespace MythFS { throw ::NetFS::SystemError(ENOSYS); } - NetFS::ReadOnlyFilePrx RecordingsVolume::openReadOnly(const NetFS::ReqEnv &, const std::string &, Ice::Int, const Ice::Current&) - { - throw ::NetFS::SystemError(ENOSYS); - } - NetFS::FilePrx RecordingsVolume::create(const NetFS::ReqEnv &, const std::string &, Ice::Int, Ice::Int, const Ice::Current&) { throw ::NetFS::SystemError(ENOSYS); diff --git a/mythfs/service/recordingsVolume.h b/mythfs/service/recordingsVolume.h index 4bf227d..bb27b18 100644 --- a/mythfs/service/recordingsVolume.h +++ b/mythfs/service/recordingsVolume.h @@ -20,7 +20,6 @@ namespace MythFS { virtual void unlink(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override; virtual NetFS::FilePrx open(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, const Ice::Current&) override; - virtual NetFS::ReadOnlyFilePrx openReadOnly(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, const Ice::Current&) override; virtual NetFS::FilePrx create(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, Ice::Int mode, const Ice::Current&) override; virtual NetFS::VFS statfs(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override; diff --git a/mythfs/unittests/testMain.cpp b/mythfs/unittests/testMain.cpp index 948b6c1..46f2727 100644 --- a/mythfs/unittests/testMain.cpp +++ b/mythfs/unittests/testMain.cpp @@ -66,7 +66,6 @@ BOOST_AUTO_TEST_CASE( unsupportedOperations ) BOOST_REQUIRE_THROW(rv->truncate(re, "/file", 0), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->unlink(re, "/file"), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->open(re, "/file", 0), NetFS::SystemError); - BOOST_REQUIRE_THROW(rv->openReadOnly(re, "/file", 0), NetFS::SystemError); BOOST_REQUIRE_THROW(rv->create(re, "/file", 0, 0), NetFS::SystemError); rv->access(re, "/", 0); // should always pass BOOST_REQUIRE_THROW(rv->mknod(re, "/file", 0, 0), NetFS::SystemError); -- cgit v1.2.3