diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-11-23 13:41:29 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-11-23 13:41:29 +0000 |
| commit | c8451301c07bf976a121d0af3fb36c0f18084bde (patch) | |
| tree | eae4670ace6f97f9e68c3731b4328d5191124814 /netfs/daemon | |
| parent | Add support for rename flags (diff) | |
| download | netfs-c8451301c07bf976a121d0af3fb36c0f18084bde.tar.bz2 netfs-c8451301c07bf976a121d0af3fb36c0f18084bde.tar.xz netfs-c8451301c07bf976a121d0af3fb36c0f18084bde.zip | |
Simplify directory interface
Removes DirectoryV2, merged into Directory
Removes listdir option as Fuse now passes the option into readdir
Diffstat (limited to 'netfs/daemon')
| -rw-r--r-- | netfs/daemon/daemonDirectory.h | 2 | ||||
| -rw-r--r-- | netfs/daemon/daemonVolume.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/netfs/daemon/daemonDirectory.h b/netfs/daemon/daemonDirectory.h index b4da8f2..d0f4e9d 100644 --- a/netfs/daemon/daemonDirectory.h +++ b/netfs/daemon/daemonDirectory.h @@ -5,7 +5,7 @@ #include <dirent.h> #include <typeConverter.h> -class DirectoryServer : public NetFS::DirectoryV2, EntryTypeConverter { +class DirectoryServer : public NetFS::Directory, EntryTypeConverter { public: DirectoryServer(DIR * od, EntryTypeConverter &); diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 6a3c7fe..096d748 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -270,8 +270,8 @@ VolumeServer::opendir(const NetFS::ReqEnv re, std::string path, const Ice::Curre if (!od) { throw NetFS::SystemError(errno); } - return Ice::uncheckedCast<NetFS::DirectoryPrx>(ice.adapter->addFacetWithUUID( - std::make_shared<DirectoryServer>(od, converter), "v02")); + return Ice::uncheckedCast<NetFS::DirectoryPrx>(ice.adapter->addWithUUID( + std::make_shared<DirectoryServer>(od, converter))); } void |