From 8b6da058806846aaf56f9252e786cc7174e637f2 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 11 Feb 2016 01:32:03 +0000 Subject: Get config deserializer by file extension --- netfs/daemon/daemon.cpp | 4 ++-- netfs/fuse/fuseApp.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp index 4db21cb..d5af905 100644 --- a/netfs/daemon/daemon.cpp +++ b/netfs/daemon/daemon.cpp @@ -3,7 +3,6 @@ #include "daemonService.h" #include "daemonVolume.h" #include -#include #include "modeCheck.h" #include @@ -47,7 +46,8 @@ NetFSDaemon::start(const std::string & name, const Ice::CommunicatorPtr & ic, co NetFS::Daemon::ConfigurationPtr NetFSDaemon::ReadConfiguration(const boost::filesystem::path & path) const { - return Slicer::DeserializeAny(path); + auto s = Slicer::FileDeserializerFactory::createNew(path.extension().string(), path); + return Slicer::DeserializeAnyWith(s); } void diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp index a7d84b5..8bd73cd 100644 --- a/netfs/fuse/fuseApp.cpp +++ b/netfs/fuse/fuseApp.cpp @@ -5,7 +5,6 @@ #include "cache.impl.h" #include #include -#include #include namespace AdHoc { @@ -63,7 +62,8 @@ NetFS::FuseApp::~FuseApp() NetFS::Client::ConfigurationPtr NetFS::FuseApp::ReadConfiguration(const boost::filesystem::path & path) const { - return Slicer::DeserializeAny(path); + auto s = Slicer::FileDeserializerFactory::createNew(path.extension().string(), path); + return Slicer::DeserializeAnyWith(s); } void * -- cgit v1.2.3