diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-04-09 16:16:55 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-04-09 16:16:55 +0100 |
| commit | 9330eea57e755a4f9f4903894987bf25b2d5cc94 (patch) | |
| tree | 9205fa7486381161485ffdcf2847f0c3c43f5cdf | |
| parent | Tidy up the mess that was type conversion (diff) | |
| download | netfs-9330eea57e755a4f9f4903894987bf25b2d5cc94.tar.bz2 netfs-9330eea57e755a4f9f4903894987bf25b2d5cc94.tar.xz netfs-9330eea57e755a4f9f4903894987bf25b2d5cc94.zip | |
Tidy up passing of type converter to file server
| -rw-r--r-- | netfs/daemon/daemonFile.cpp | 4 | ||||
| -rw-r--r-- | netfs/daemon/daemonFile.h | 2 | ||||
| -rw-r--r-- | netfs/daemon/daemonVolume.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/netfs/daemon/daemonFile.cpp b/netfs/daemon/daemonFile.cpp index 94aebe6..65a418f 100644 --- a/netfs/daemon/daemonFile.cpp +++ b/netfs/daemon/daemonFile.cpp @@ -7,8 +7,8 @@ #include "daemonFile.h" #include <entCache.h> -FileServer::FileServer(int f, const EntryResolver<uid_t> & u, const EntryResolver<gid_t> & g) : - TypeConverter(u, g), +FileServer::FileServer(int f, TypeConverter & t) : + TypeConverter(t), fd(f) { } diff --git a/netfs/daemon/daemonFile.h b/netfs/daemon/daemonFile.h index ca5b7ca..1853732 100644 --- a/netfs/daemon/daemonFile.h +++ b/netfs/daemon/daemonFile.h @@ -6,7 +6,7 @@ class FileServer : public NetFS::File, TypeConverter { public: - FileServer(int fd, const EntryResolver<uid_t> &, const EntryResolver<gid_t> &); + FileServer(int fd, TypeConverter &); virtual ~FileServer(); virtual void close(const Ice::Current&) override; diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 7603691..fef26a1 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -242,7 +242,7 @@ VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int if (fd == -1) { throw NetFS::SystemError(errno); } - return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, userLookup, groupLookup))); + return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, converter))); } NetFS::FilePrx @@ -261,7 +261,7 @@ VolumeServer::create(const NetFS::ReqEnv & re, const std::string & path, Ice::In ::unlink(p.c_str()); throw NetFS::SystemError(errno); } - return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, userLookup, groupLookup))); + return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, converter))); } NetFS::DirectoryPrx |