Switch to the StringSeq interface where possible because it's considerably less annoying

1 files changed, 10 insertions, 7 deletions

diff --git a/netfs/unittests/mockFuse.cpp b/netfs/unittests/mockFuse.cpp
index 2b9edad..a9e2cc1 100644
--- a/netfs/unittests/mockFuse.cpp
+++ b/netfs/unittests/mockFuse.cpp
@@ -1,7 +1,7 @@
 #include "mockFuse.h"
 
-FuseMock::FuseMock(const std::string & ep, int & argc, char ** argv) :
-	NetFS::FuseApp(argc, argv),
+FuseMock::FuseMock(const std::string & ep, const Ice::StringSeq & a) :
+	NetFS::FuseApp(a),
 	testEndpoint(ep)
 {
 	::memset(&context, 0, sizeof(fuse_context));
@@ -26,7 +26,7 @@ FuseMock::fuse_opt_parse(struct fuse_args * args, void * data, const struct fuse
 }
 
 int
-FuseMock::main(int &, char **, const struct fuse_operations * o)
+FuseMock::main(int, char **, const struct fuse_operations * o)
 {
 	o->init(NULL);
 	ops = *o;
@@ -45,12 +45,15 @@ FuseMock::ReadConfiguration(const std::string & path) const
 	return c;
 }
 
-FuseMockHost::FuseMockHost(const std::string & ep, int c, char ** v) :
-	argc(c),
-	app(new FuseMock(ep, c, v)),
+FuseMockHost::FuseMockHost(const std::string & ep, const Ice::StringSeq & a) :
+	app(new FuseMock(ep, a)),
 	fuse(&app->ops)
 {
-	FuseAppBase::run(argc, v, app);
+	std::vector<char *> argv;
+	for (auto & arg : a) {
+		argv.push_back(const_cast<char *>(arg.c_str()));
+	}
+	FuseAppBase::run(a.size(), &argv.front(), app);
 }
 
 FuseMockHost::~FuseMockHost()