diff options
| -rw-r--r-- | btrfs.c | 4 | ||||
| -rw-r--r-- | cmds-receive.c | 4 | ||||
| -rw-r--r-- | cmds-send.c | 11 | ||||
| -rw-r--r-- | commands.h | 3 |
4 files changed, 9 insertions, 13 deletions
@@ -247,8 +247,8 @@ const struct cmd_group btrfs_cmd_group = { { "device", cmd_device, NULL, &device_cmd_group, 0 }, { "scrub", cmd_scrub, NULL, &scrub_cmd_group, 0 }, { "inspect-internal", cmd_inspect, NULL, &inspect_cmd_group, 0 }, - { "send", cmd_send, NULL, &send_cmd_group, 0 }, - { "receive", cmd_receive, NULL, &receive_cmd_group, 0 }, + { "send", cmd_send, cmd_send_usage, NULL, 0 }, + { "receive", cmd_receive, cmd_receive_usage, NULL, 0 }, { "quota", cmd_quota, NULL, "a_cmd_group, 0 }, { "qgroup", cmd_qgroup, NULL, &qgroup_cmd_group, 0 }, { "replace", cmd_replace, NULL, &replace_cmd_group, 0 }, diff --git a/cmds-receive.c b/cmds-receive.c index 2fae2994..973687f3 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -881,7 +881,7 @@ static const char * const receive_cmd_group_usage[] = { NULL }; -static const char * const cmd_receive_usage[] = { +const char * const cmd_receive_usage[] = { "btrfs receive [-v] [-f <infile>] <mount>", "Receive subvolumes from stdin.", "Receives one or more subvolumes that were previously ", @@ -893,7 +893,7 @@ static const char * const cmd_receive_usage[] = { "After receiving a subvolume, it is immediately set to", "read only.\n", "-v Enable verbose debug output. Each", - " occurrency of this option increases the", + " occurrence of this option increases the", " verbose level more.", "-f <infile> By default, btrfs receive uses stdin", " to receive the subvolumes. Use this", diff --git a/cmds-send.c b/cmds-send.c index b314c400..43355dbe 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -637,7 +637,7 @@ static const char * const send_cmd_group_usage[] = { NULL }; -static const char * const cmd_send_usage[] = { +const char * const cmd_send_usage[] = { "btrfs send [-v] [-p <parent>] [-c <clone-src>] <subvol>", "Send the subvolume to stdout.", "Sends the subvolume specified by <subvol> to stdout.", @@ -651,7 +651,7 @@ static const char * const cmd_send_usage[] = { "which case 'btrfs send' will determine a suitable parent among the", "clone sources itself.", "\n", - "-v Enable verbose debug output. Each occurrency of", + "-v Enable verbose debug output. Each occurrence of", " this option increases the verbose level more.", "-p <parent> Send an incremental stream from <parent> to", " <subvol>.", @@ -663,13 +663,6 @@ static const char * const cmd_send_usage[] = { NULL }; -const struct cmd_group send_cmd_group = { - send_cmd_group_usage, NULL, { - { "send", cmd_send_start, cmd_send_usage, NULL, 0 }, - { 0, 0, 0, 0, 0 }, - }, -}; - int cmd_send(int argc, char **argv) { return cmd_send_start(argc, argv); @@ -91,6 +91,9 @@ extern const struct cmd_group quota_cmd_group; extern const struct cmd_group qgroup_cmd_group; extern const struct cmd_group replace_cmd_group; +extern const char * const cmd_send_usage[]; +extern const char * const cmd_receive_usage[]; + int cmd_subvolume(int argc, char **argv); int cmd_filesystem(int argc, char **argv); int cmd_balance(int argc, char **argv); |