diff options
| author | Gui Hecheng <guihc.fnst@cn.fujitsu.com> | 2014-07-16 11:59:46 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-08-22 15:07:02 +0200 |
| commit | f1672e50c7f73cbdb1d9817e126c41a3db6d93ce (patch) | |
| tree | 98fe7252df2c382e7df70fb8a223c075416e0bbf /cmds-restore.c | |
| parent | 2e1accf4fd47e90584b1741ff53bf7eec41d5510 (diff) | |
| download | btrfs-progs-f1672e50c7f73cbdb1d9817e126c41a3db6d93ce.tar.gz | |
btrfs-progs: use check_argc_* to check arg number for all tools
Since this patch:
btrfs-progs: move the check_argc_* functions into utils.c
All tools including the independent tools(e.g. btrfs-image, btrfs-convert)
can share the convenience of the check_argc_* functions, so this patch
adopt the argc check functions globally.
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'cmds-restore.c')
| -rw-r--r-- | cmds-restore.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds-restore.c b/cmds-restore.c index 3465f84..8e8afc5 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -1214,9 +1214,10 @@ int cmd_restore(int argc, char **argv) } } - if (!list_roots && optind + 1 >= argc) + set_argv0(argv); + if (!list_roots && check_argc_min(argc - optind, 2)) usage(cmd_restore_usage); - else if (list_roots && optind >= argc) + else if (list_roots && check_argc_min(argc - optind, 1)) usage(cmd_restore_usage); if (fs_location && root_objectid) { |