From: Jeff Mahoney <jeffm@xxxxxxxx>
Now that we have a cmd_struct everywhere, we can pass it to
clean_args_no_options and have it resolve the usage string from
it there. This is necessary for it to pass the cmd_struct to
usage() in the next patch.
Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
---
cmds-balance.c | 6 +++---
cmds-device.c | 9 +++++----
cmds-filesystem.c | 8 ++++----
cmds-inspect.c | 4 ++--
cmds-qgroup.c | 16 ++++++++--------
cmds-quota.c | 4 ++--
cmds-rescue.c | 4 ++--
cmds-scrub.c | 15 ++++++++-------
cmds-subvolume.c | 6 +++---
help.c | 9 +++++----
help.h | 7 ++++---
11 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/cmds-balance.c b/cmds-balance.c
index 1bd7b3ce..488fffcc 100644
--- a/cmds-balance.c
+++ b/cmds-balance.c
@@ -689,7 +689,7 @@ static int cmd_balance_pause(const struct cmd_struct *cmd,
int ret;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_balance_pause_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_balance_pause_usage);
@@ -729,7 +729,7 @@ static int cmd_balance_cancel(const struct cmd_struct *cmd,
int ret;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_balance_cancel_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_balance_cancel_usage);
@@ -770,7 +770,7 @@ static int cmd_balance_resume(const struct cmd_struct *cmd,
int fd;
int ret;
- clean_args_no_options(argc, argv, cmd_balance_resume_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_balance_resume_usage);
diff --git a/cmds-device.c b/cmds-device.c
index feb53f68..5be748f7 100644
--- a/cmds-device.c
+++ b/cmds-device.c
@@ -149,11 +149,12 @@ static int _cmd_device_remove(const struct cmd_struct *cmd,
char *mntpnt;
int i, fdmnt, ret = 0;
DIR *dirstream = NULL;
+ const char * const *usagestr = cmd->usagestr;
- clean_args_no_options(argc, argv, cmd->usagestr);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_min(argc - optind, 2))
- usage(cmd->usagestr);
+ usage(usagestr);
mntpnt = argv[argc - 1];
@@ -347,7 +348,7 @@ static int cmd_device_ready(const struct cmd_struct *cmd, int argc, char **argv)
int ret;
char *path;
- clean_args_no_options(argc, argv, cmd->usagestr);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_device_ready_usage);
@@ -573,7 +574,7 @@ static int cmd_device_usage(const struct cmd_struct *cmd, int argc, char **argv)
unit_mode = get_unit_mode_from_arg(&argc, argv, 1);
- clean_args_no_options(argc, argv, cmd->usagestr);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_min(argc - optind, 1))
usage(cmd_device_usage_usage);
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index c2ee8595..b793532b 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -127,7 +127,7 @@ static int cmd_filesystem_df(const struct cmd_struct *cmd,
unit_mode = get_unit_mode_from_arg(&argc, argv, 1);
- clean_args_no_options(argc, argv, cmd_filesystem_df_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_filesystem_df_usage);
@@ -822,7 +822,7 @@ static int cmd_filesystem_sync(const struct cmd_struct *cmd,
char *path;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_filesystem_sync_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_filesystem_sync_usage);
@@ -1102,7 +1102,7 @@ static int cmd_filesystem_resize(const struct cmd_struct *cmd,
DIR *dirstream = NULL;
struct stat st;
- clean_args_no_options_relaxed(argc, argv, cmd_filesystem_resize_usage);
+ clean_args_no_options_relaxed(cmd, argc, argv);
if (check_argc_exact(argc - optind, 2))
usage(cmd_filesystem_resize_usage);
@@ -1175,7 +1175,7 @@ static const char * const cmd_filesystem_label_usage[] = {
static int cmd_filesystem_label(const struct cmd_struct *cmd,
int argc, char **argv)
{
- clean_args_no_options(argc, argv, cmd_filesystem_label_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_min(argc - optind, 1) ||
check_argc_max(argc - optind, 2))
diff --git a/cmds-inspect.c b/cmds-inspect.c
index 1bdc8bd9..ece8c8d4 100644
--- a/cmds-inspect.c
+++ b/cmds-inspect.c
@@ -277,7 +277,7 @@ static int cmd_inspect_subvolid_resolve(const struct cmd_struct *cmd,
char path[PATH_MAX];
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_inspect_subvolid_resolve_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 2))
usage(cmd_inspect_subvolid_resolve_usage);
@@ -320,7 +320,7 @@ static int cmd_inspect_rootid(const struct cmd_struct *cmd,
u64 rootid;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_inspect_rootid_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_inspect_rootid_usage);
diff --git a/cmds-qgroup.c b/cmds-qgroup.c
index 2972baee..6e59c559 100644
--- a/cmds-qgroup.c
+++ b/cmds-qgroup.c
@@ -33,8 +33,8 @@ static const char * const qgroup_cmd_group_usage[] = {
NULL
};
-static int _cmd_qgroup_assign(int assign, int argc, char **argv,
- const char * const *usage_str)
+static int _cmd_qgroup_assign(const struct cmd_struct *cmd, int assign,
+ int argc, char **argv)
{
int ret = 0;
int fd;
@@ -70,11 +70,11 @@ static int _cmd_qgroup_assign(int assign, int argc, char **argv,
}
}
} else {
- clean_args_no_options(argc, argv, usage_str);
+ clean_args_no_options(cmd, argc, argv);
}
if (check_argc_exact(argc - optind, 3))
- usage(usage_str);
+ usage(cmd->usagestr);
memset(&args, 0, sizeof(args));
args.assign = assign;
@@ -218,7 +218,7 @@ static const char * const cmd_qgroup_assign_usage[] = {
static int cmd_qgroup_assign(const struct cmd_struct *cmd,
int argc, char **argv)
{
- return _cmd_qgroup_assign(1, argc, argv, cmd_qgroup_assign_usage);
+ return _cmd_qgroup_assign(cmd, 1, argc, argv);
}
static DEFINE_SIMPLE_COMMAND(qgroup_assign, "assign");
@@ -231,7 +231,7 @@ static const char * const cmd_qgroup_remove_usage[] = {
static int cmd_qgroup_remove(const struct cmd_struct *cmd,
int argc, char **argv)
{
- return _cmd_qgroup_assign(0, argc, argv, cmd_qgroup_remove_usage);
+ return _cmd_qgroup_assign(cmd, 0, argc, argv);
}
static DEFINE_SIMPLE_COMMAND(qgroup_remove, "remove");
@@ -246,7 +246,7 @@ static int cmd_qgroup_create(const struct cmd_struct *cmd,
{
int ret;
- clean_args_no_options(argc, argv, cmd_qgroup_create_usage);
+ clean_args_no_options(cmd, argc, argv);
ret = _cmd_qgroup_create(1, argc, argv);
@@ -267,7 +267,7 @@ static int cmd_qgroup_destroy(const struct cmd_struct *cmd,
{
int ret;
- clean_args_no_options(argc, argv, cmd_qgroup_destroy_usage);
+ clean_args_no_options(cmd, argc, argv);
ret = _cmd_qgroup_create(0, argc, argv);
diff --git a/cmds-quota.c b/cmds-quota.c
index a6e7a6f6..23757f9a 100644
--- a/cmds-quota.c
+++ b/cmds-quota.c
@@ -71,7 +71,7 @@ static int cmd_quota_enable(const struct cmd_struct *cmd, int argc, char **argv)
{
int ret;
- clean_args_no_options(argc, argv, cmd_quota_enable_usage);
+ clean_args_no_options(cmd, argc, argv);
ret = quota_ctl(BTRFS_QUOTA_CTL_ENABLE, argc, argv);
@@ -92,7 +92,7 @@ static int cmd_quota_disable(const struct cmd_struct *cmd,
{
int ret;
- clean_args_no_options(argc, argv, cmd_quota_disable_usage);
+ clean_args_no_options(cmd, argc, argv);
ret = quota_ctl(BTRFS_QUOTA_CTL_DISABLE, argc, argv);
diff --git a/cmds-rescue.c b/cmds-rescue.c
index f5a618e1..975ff05a 100644
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -170,7 +170,7 @@ static int cmd_rescue_zero_log(const struct cmd_struct *cmd,
char *devname;
int ret;
- clean_args_no_options(argc, argv, cmd_rescue_zero_log_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc, 2))
usage(cmd_rescue_zero_log_usage);
@@ -223,7 +223,7 @@ static int cmd_rescue_fix_device_size(const struct cmd_struct *cmd,
char *devname;
int ret;
- clean_args_no_options(argc, argv, cmd_rescue_fix_device_size_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc, 2))
usage(cmd_rescue_fix_device_size_usage);
diff --git a/cmds-scrub.c b/cmds-scrub.c
index a762f035..9917a2f4 100644
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -1097,8 +1097,7 @@ static int is_scrub_running_in_kernel(int fd,
static const char * const cmd_scrub_start_usage[];
static const char * const cmd_scrub_resume_usage[];
-static int scrub_start(const struct cmd_struct *cmd, int argc, char **argv,
- bool resume)
+static int scrub_start(int argc, char **argv, bool resume)
{
int fdmnt;
int prg_fd = -1;
@@ -1177,14 +1176,16 @@ static int scrub_start(const struct cmd_struct *cmd, int argc, char **argv,
break;
case '?':
default:
- usage(cmd->usagestr);
+ usage(resume ? cmd_scrub_resume_usage :
+ cmd_scrub_start_usage);
}
}
/* try to catch most error cases before forking */
if (check_argc_exact(argc - optind, 1)) {
- usage(cmd->usagestr);
+ usage(resume ? cmd_scrub_resume_usage :
+ cmd_scrub_start_usage);
}
spc.progress = NULL;
@@ -1577,7 +1578,7 @@ static const char * const cmd_scrub_start_usage[] = {
static int cmd_scrub_start(const struct cmd_struct *cmd, int argc, char **argv)
{
- return scrub_start(cmd, argc, argv, false);
+ return scrub_start(argc, argv, false);
}
static DEFINE_SIMPLE_COMMAND(scrub_start, "start");
@@ -1594,7 +1595,7 @@ static int cmd_scrub_cancel(const struct cmd_struct *cmd, int argc, char **argv)
int fdmnt = -1;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_scrub_cancel_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_scrub_cancel_usage);
@@ -1644,7 +1645,7 @@ static const char * const cmd_scrub_resume_usage[] = {
static int cmd_scrub_resume(const struct cmd_struct *cmd, int argc, char **argv)
{
- return scrub_start(cmd, argc, argv, true);
+ return scrub_start(argc, argv, true);
}
static DEFINE_SIMPLE_COMMAND(scrub_resume, "resume");
diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index 13303db8..c577cc23 100644
--- a/cmds-subvolume.c
+++ b/cmds-subvolume.c
@@ -812,7 +812,7 @@ static int cmd_subvol_get_default(const struct cmd_struct *cmd,
u64 default_id;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_subvol_get_default_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 1))
usage(cmd_subvol_get_default_usage);
@@ -880,7 +880,7 @@ static int cmd_subvol_set_default(const struct cmd_struct *cmd,
char *subvolid;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_subvol_set_default_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_min(argc - optind, 1) ||
check_argc_max(argc - optind, 2))
@@ -945,7 +945,7 @@ static int cmd_subvol_find_new(const struct cmd_struct *cmd,
u64 last_gen;
DIR *dirstream = NULL;
- clean_args_no_options(argc, argv, cmd_subvol_find_new_usage);
+ clean_args_no_options(cmd, argc, argv);
if (check_argc_exact(argc - optind, 2))
usage(cmd_subvol_find_new_usage);
diff --git a/help.c b/help.c
index b7f06aae..23d6ea8f 100644
--- a/help.c
+++ b/help.c
@@ -86,7 +86,7 @@ int check_argc_max(int nargs, int expected)
* Unknown short and long options are reported, optionally the @usage is printed
* before exit.
*/
-void clean_args_no_options(int argc, char *argv[], const char * const *usagestr)
+void clean_args_no_options(const struct cmd_struct *cmd, int argc, char *argv[])
{
static const struct option long_options[] = {
{NULL, 0, NULL, 0}
@@ -100,8 +100,8 @@ void clean_args_no_options(int argc, char *argv[], const char * const *usagestr)
switch (c) {
default:
- if (usagestr)
- usage(usagestr);
+ if (cmd->usagestr)
+ usage(cmd->usagestr);
}
}
}
@@ -115,7 +115,8 @@ void clean_args_no_options(int argc, char *argv[], const char * const *usagestr)
* - "-- option1 option2 ..."
* - "option1 option2 ..."
*/
-void clean_args_no_options_relaxed(int argc, char *argv[], const char * const *usagestr)
+void clean_args_no_options_relaxed(const struct cmd_struct *cmd,
+ int argc, char *argv[])
{
if (argc <= 1)
return;
diff --git a/help.h b/help.h
index a69ea6b2..e642f58d 100644
--- a/help.h
+++ b/help.h
@@ -71,9 +71,10 @@ void help_command_group(const struct cmd_group *grp, int argc, char **argv);
int check_argc_exact(int nargs, int expected);
int check_argc_min(int nargs, int expected);
int check_argc_max(int nargs, int expected);
-void clean_args_no_options(int argc, char *argv[], const char * const *usage);
-void clean_args_no_options_relaxed(int argc, char *argv[],
- const char * const *usagestr);
+void clean_args_no_options(const struct cmd_struct *cmd,
+ int argc, char *argv[]);
+void clean_args_no_options_relaxed(const struct cmd_struct *cmd,
+ int argc, char *argv[]);
void fixup_argv0(char **argv, const char *token);
void set_argv0(char **argv);
--
2.12.3
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
