general code cleanup

This commit is contained in:
Antonio SJ Musumeci
2019-01-31 22:47:09 -05:00
parent 5a1a60742e
commit 9d9ee7b71d
178 changed files with 5098 additions and 5253 deletions
+20 -25
View File
@@ -39,7 +39,6 @@
using std::string;
using std::vector;
using namespace mergerfs;
enum
{
@@ -454,33 +453,29 @@ option_processor(void *data,
return rv;
}
namespace mergerfs
namespace options
{
namespace options
void
parse(fuse_args &args,
Config &config)
{
void
parse(fuse_args &args,
Config &config)
{
const struct fuse_opt opts[] =
{
FUSE_OPT_KEY("-h",MERGERFS_OPT_HELP),
FUSE_OPT_KEY("--help",MERGERFS_OPT_HELP),
FUSE_OPT_KEY("-v",MERGERFS_OPT_VERSION),
FUSE_OPT_KEY("-V",MERGERFS_OPT_VERSION),
FUSE_OPT_KEY("--version",MERGERFS_OPT_VERSION),
{NULL,-1U,0}
};
const struct fuse_opt opts[] =
{
FUSE_OPT_KEY("-h",MERGERFS_OPT_HELP),
FUSE_OPT_KEY("--help",MERGERFS_OPT_HELP),
FUSE_OPT_KEY("-v",MERGERFS_OPT_VERSION),
FUSE_OPT_KEY("-V",MERGERFS_OPT_VERSION),
FUSE_OPT_KEY("--version",MERGERFS_OPT_VERSION),
{NULL,-1U,0}
};
fuse_opt_parse(&args,
&config,
opts,
::option_processor);
fuse_opt_parse(&args,
&config,
opts,
::option_processor);
set_default_options(args);
set_fsname(args,config.branches);
set_subtype(args);
}
set_default_options(args);
set_fsname(args,config.branches);
set_subtype(args);
}
}