summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--netfs/fuse.cpp2
-rw-r--r--netfs/fuseConfig.cpp4
-rw-r--r--netfs/fuseConfig.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/netfs/fuse.cpp b/netfs/fuse.cpp
index 008ba27..1b743f2 100644
--- a/netfs/fuse.cpp
+++ b/netfs/fuse.cpp
@@ -100,7 +100,7 @@ void *
NetFS::init(struct fuse_conn_info *)
{
puts(exportName.c_str());
- FuseConfigPtr fc = FuseConfig::Load("client.xml");
+ FuseConfigPtr fc = FuseConfig::Load(configPath);
FuseConfig::ExportPtr e = fc->exports[exportName];
const std::string & ep = *e->endpoints.begin();
diff --git a/netfs/fuseConfig.cpp b/netfs/fuseConfig.cpp
index 26ee6a1..ec364cf 100644
--- a/netfs/fuseConfig.cpp
+++ b/netfs/fuseConfig.cpp
@@ -2,9 +2,9 @@
#include <string.h>
FuseConfigPtr
-FuseConfig::Load(const char * path)
+FuseConfig::Load(const std::string & path)
{
- xmlDoc * doc = xmlReadFile(path, NULL, 0);
+ xmlDoc * doc = xmlReadFile(path.c_str(), NULL, 0);
FuseConfigPtr dc = new FuseConfig(doc->children);
xmlFreeDoc(doc);
return dc;
diff --git a/netfs/fuseConfig.h b/netfs/fuseConfig.h
index 5416360..f33c8f7 100644
--- a/netfs/fuseConfig.h
+++ b/netfs/fuseConfig.h
@@ -23,7 +23,7 @@ class FuseConfig : public virtual IntrusivePtrBase {
};
FuseConfig(xmlNodePtr);
- static boost::intrusive_ptr<FuseConfig> Load(const char * path);
+ static boost::intrusive_ptr<FuseConfig> Load(const std::string & path);
ExportMap exports;
};