From 852a6e962084cd7c78b474b70c72361f153f63da Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 16 Apr 2016 01:27:44 +0100 Subject: NetFS 1.2 compat --- mythfs/service/recordingsVolume.cpp | 5 +---- mythfs/service/recordingsVolume.h | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mythfs/service/recordingsVolume.cpp b/mythfs/service/recordingsVolume.cpp index c4ddbc2..f8ba489 100644 --- a/mythfs/service/recordingsVolume.cpp +++ b/mythfs/service/recordingsVolume.cpp @@ -8,7 +8,6 @@ #include "inodes/groupingByDateDirectory.h" #include "openDirectory.h" #include -#include namespace MythFS { RecordingsVolume::RecordingsVolume(DBPrx db) @@ -61,9 +60,7 @@ namespace MythFS { if (::statvfs(p.c_str(), &s) != 0) { throw NetFS::SystemError(errno); } - NetFS::VFS t; - t << s; - return t; + return converter.convert(s); } Ice::Int RecordingsVolume::access(const NetFS::ReqEnv &, const std::string &, Ice::Int, const Ice::Current&) diff --git a/mythfs/service/recordingsVolume.h b/mythfs/service/recordingsVolume.h index bb27b18..6887301 100644 --- a/mythfs/service/recordingsVolume.h +++ b/mythfs/service/recordingsVolume.h @@ -4,6 +4,7 @@ #include #include "inodes/staticDirectory.h" #include +#include namespace MythFS { class RecordingsVolume : public ::NetFS::Volume, public StaticDirectory { @@ -38,6 +39,7 @@ namespace MythFS { virtual void disconnect(const Ice::Current&) override; private: + TypeConverter converter; Node::PointerType resolvePath(const std::string &); }; } -- cgit v1.2.3