summaryrefslogtreecommitdiff
path: root/netfs/daemon/daemonVolume.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'netfs/daemon/daemonVolume.cpp')
-rw-r--r--netfs/daemon/daemonVolume.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp
index e1295d6..e57c806 100644
--- a/netfs/daemon/daemonVolume.cpp
+++ b/netfs/daemon/daemonVolume.cpp
@@ -36,7 +36,7 @@ VolumeServer::disconnect(const Ice::Current & ice)
}
Ice::Int
-VolumeServer::access(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, const Ice::Current &)
+VolumeServer::access(NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
struct stat s;
@@ -62,7 +62,7 @@ VolumeServer::access(const NetFS::ReqEnv & re, const std::string & path, Ice::In
}
NetFS::Attr
-VolumeServer::getattr(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current &)
+VolumeServer::getattr(NetFS::ReqEnv re, std::string path, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
struct stat s;
@@ -75,7 +75,7 @@ VolumeServer::getattr(const NetFS::ReqEnv & re, const std::string & path, const
}
void
-VolumeServer::mknod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, Ice::Int dev, const Ice::Current&)
+VolumeServer::mknod(NetFS::ReqEnv re, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -87,7 +87,7 @@ VolumeServer::mknod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
}
void
-VolumeServer::symlink(const NetFS::ReqEnv & re, const std::string & path1, const std::string & path2, const Ice::Current &)
+VolumeServer::symlink(NetFS::ReqEnv re, std::string path1, std::string path2, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -103,7 +103,7 @@ VolumeServer::symlink(const NetFS::ReqEnv & re, const std::string & path1, const
}
void
-VolumeServer::link(const NetFS::ReqEnv & re, const std::string & path1, const std::string & path2, const Ice::Current &)
+VolumeServer::link(NetFS::ReqEnv re, std::string path1, std::string path2, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -119,7 +119,7 @@ VolumeServer::link(const NetFS::ReqEnv & re, const std::string & path1, const st
}
void
-VolumeServer::rename(const NetFS::ReqEnv & re, const std::string & from, const std::string & to, const Ice::Current &)
+VolumeServer::rename(NetFS::ReqEnv re, std::string from, std::string to, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -133,7 +133,7 @@ VolumeServer::rename(const NetFS::ReqEnv & re, const std::string & from, const s
}
std::string
-VolumeServer::readlink(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current &)
+VolumeServer::readlink(NetFS::ReqEnv re, std::string path, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -148,7 +148,7 @@ VolumeServer::readlink(const NetFS::ReqEnv & re, const std::string & path, const
}
void
-VolumeServer::chmod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, const Ice::Current &)
+VolumeServer::chmod(NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -160,7 +160,7 @@ VolumeServer::chmod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
}
void
-VolumeServer::chown(const NetFS::ReqEnv & re, const std::string & path, Ice::Int uid, Ice::Int gid, const Ice::Current &)
+VolumeServer::chown(NetFS::ReqEnv re, std::string path, Ice::Int uid, Ice::Int gid, const Ice::Current &)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -172,7 +172,7 @@ VolumeServer::chown(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
}
void
-VolumeServer::utimens(const NetFS::ReqEnv & re, const std::string & path,
+VolumeServer::utimens(NetFS::ReqEnv re, std::string path,
Ice::Long s0, Ice::Long ns0, Ice::Long s1, Ice::Long ns1, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
@@ -190,7 +190,7 @@ VolumeServer::utimens(const NetFS::ReqEnv & re, const std::string & path,
}
NetFS::VFS
-VolumeServer::statfs(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current&)
+VolumeServer::statfs(NetFS::ReqEnv re, std::string path, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -204,7 +204,7 @@ VolumeServer::statfs(const NetFS::ReqEnv & re, const std::string & path, const I
}
void
-VolumeServer::truncate(const NetFS::ReqEnv & re, const std::string & path, Ice::Long size, const Ice::Current&)
+VolumeServer::truncate(NetFS::ReqEnv re, std::string path, Ice::Long size, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -216,7 +216,7 @@ VolumeServer::truncate(const NetFS::ReqEnv & re, const std::string & path, Ice::
}
void
-VolumeServer::unlink(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current&)
+VolumeServer::unlink(NetFS::ReqEnv re, std::string path, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -227,8 +227,8 @@ VolumeServer::unlink(const NetFS::ReqEnv & re, const std::string & path, const I
}
}
-NetFS::FilePrx
-VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int flags, const Ice::Current & ice)
+NetFS::FilePrxPtr
+VolumeServer::open(NetFS::ReqEnv re, std::string path, Ice::Int flags, const Ice::Current & ice)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -241,12 +241,12 @@ VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
if (fd == -1) {
throw NetFS::SystemError(errno);
}
- return NetFS::FilePrx::uncheckedCast(ice.adapter->addFacetWithUUID(
- new FileServer(fd, converter), "v01"));
+ return Ice::uncheckedCast<NetFS::FilePrx>(ice.adapter->addFacetWithUUID(
+ std::make_shared<FileServer>(fd, converter), "v01"));
}
-NetFS::FilePrx
-VolumeServer::create(const NetFS::ReqEnv & re, const std::string & path, Ice::Int flags, Ice::Int mode, const Ice::Current & ice)
+NetFS::FilePrxPtr
+VolumeServer::create(NetFS::ReqEnv re, std::string path, Ice::Int flags, Ice::Int mode, const Ice::Current & ice)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -261,12 +261,12 @@ VolumeServer::create(const NetFS::ReqEnv & re, const std::string & path, Ice::In
::unlink(p.c_str());
throw NetFS::SystemError(errno);
}
- return NetFS::FilePrx::uncheckedCast(ice.adapter->addFacetWithUUID(
- new FileServer(fd, converter), "v01"));
+ return Ice::uncheckedCast<NetFS::FilePrx>(ice.adapter->addFacetWithUUID(
+ std::make_shared<FileServer>(fd, converter), "v01"));
}
-NetFS::DirectoryPrx
-VolumeServer::opendir(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current & ice)
+NetFS::DirectoryPrxPtr
+VolumeServer::opendir(NetFS::ReqEnv re, std::string path, const Ice::Current & ice)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -276,12 +276,12 @@ VolumeServer::opendir(const NetFS::ReqEnv & re, const std::string & path, const
if (!od) {
throw NetFS::SystemError(errno);
}
- return NetFS::DirectoryPrx::uncheckedCast(ice.adapter->addFacetWithUUID(
- new DirectoryServer(od, converter), "v02"));
+ return Ice::uncheckedCast<NetFS::DirectoryPrx>(ice.adapter->addFacetWithUUID(
+ std::make_shared<DirectoryServer>(od, converter), "v02"));
}
void
-VolumeServer::mkdir(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, const Ice::Current&)
+VolumeServer::mkdir(NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;
@@ -297,7 +297,7 @@ VolumeServer::mkdir(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
}
void
-VolumeServer::rmdir(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current&)
+VolumeServer::rmdir(NetFS::ReqEnv re, std::string path, const Ice::Current&)
{
ModeCheck mc(re, root, userLookup, groupLookup);
errno = 0;