From 3620de44d124a33a561bdf90a27ad3fc75b039c0 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Wed, 1 Jun 2016 00:46:23 -0700 Subject: [PATCH] dll: fuse: help system refactoring --- src/dll/fuse/fuse_main.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/dll/fuse/fuse_main.c b/src/dll/fuse/fuse_main.c index f17a6231..9e2ca06a 100644 --- a/src/dll/fuse/fuse_main.c +++ b/src/dll/fuse/fuse_main.c @@ -45,6 +45,18 @@ static struct fuse_opt fsp_fuse_main_opts[] = static int fsp_fuse_main_opt_proc(void *opt_data0, const char *arg, int key, struct fuse_args *outargs) { + static PWSTR HeaderHelp = L"" + "\n" + " -o opt,[opt...] mount options\n" + " -h --help print help\n" + " -V --version print version\n" + "\n"; + static PWSTR MainHelp = L"" + "FUSE options:\n" + " -d -o debug enable debug output (implies -f)\n" + " -f foreground operation\n" + " -s disable multi-threaded operation\n" + "\n"; struct fsp_fuse_main_opt_data *opt_data = opt_data0; switch (key) @@ -54,25 +66,14 @@ static int fsp_fuse_main_opt_proc(void *opt_data0, const char *arg, int key, case 'h': FspServiceLog(EVENTLOG_ERROR_TYPE, L"" "usage: %s mountpoint [options]\n" - "\n" - " -o opt,[opt...] mount options\n" - " -h --help print help\n" - " -V --version print version\n" - "\n" - "FUSE options:\n" - " -d -o debug enable debug output (implies -f)\n" - " -f foreground operation\n" - " -s disable multi-threaded operation\n" - "\n", - FspDiagIdent()); + "%s" + "%s", + FspDiagIdent(), HeaderHelp, MainHelp); return 1; case 'H': FspServiceLog(EVENTLOG_ERROR_TYPE, L"" - "FUSE options:\n" - " -d -o debug enable debug output (implies -f)\n" - " -f foreground operation\n" - " -s disable multi-threaded operation\n" - "\n"); + "%s", + MainHelp); fsp_fuse_opt_add_arg(opt_data->env, outargs, "-h"); return 0; case FUSE_OPT_KEY_NONOPT: