From 49e0f3e6466db78fb6c12f71e0c46be4b1492d90 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 6 Nov 2015 16:39:49 +0100 Subject: [PATCH] btrfs-progs: utils: rename helpinfo unit vairables Signed-off-by: David Sterba --- cmds-device.c | 2 +- cmds-fi-usage.c | 2 +- cmds-filesystem.c | 4 ++-- cmds-qgroup.c | 2 +- utils.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index c2f3a408..2ed32a26 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -461,7 +461,7 @@ out: static const char * const cmd_device_usage_usage[] = { "btrfs device usage [options] [..]", "Show detailed information about internal allocations in devices.", - HELPINFO_OUTPUT_UNIT_DF, + HELPINFO_UNITS_SHORT_LONG, NULL }; diff --git a/cmds-fi-usage.c b/cmds-fi-usage.c index 4b558a88..72d80278 100644 --- a/cmds-fi-usage.c +++ b/cmds-fi-usage.c @@ -902,7 +902,7 @@ out: const char * const cmd_filesystem_usage_usage[] = { "btrfs filesystem usage [options] [..]", "Show detailed information about internal filesystem usage .", - HELPINFO_OUTPUT_UNIT_DF, + HELPINFO_UNITS_SHORT_LONG, "-T show data in tabular format", NULL }; diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 819daa1d..98c13f56 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -123,7 +123,7 @@ static const char * const filesystem_cmd_group_usage[] = { static const char * const cmd_filesystem_df_usage[] = { "btrfs filesystem df [options] ", "Show space usage information for a mount point", - HELPINFO_OUTPUT_UNIT_DF, + HELPINFO_UNITS_SHORT_LONG, NULL }; @@ -772,7 +772,7 @@ static const char * const cmd_filesystem_show_usage[] = { "Show the structure of a filesystem", "-d|--all-devices show only disks under /dev containing btrfs filesystem", "-m|--mounted show only mounted btrfs", - HELPINFO_OUTPUT_UNIT, + HELPINFO_UNITS_LONG, "If no argument is given, structure of all present filesystems is shown.", NULL }; diff --git a/cmds-qgroup.c b/cmds-qgroup.c index a64b7167..b0c28c91 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -271,7 +271,7 @@ static const char * const cmd_qgroup_show_usage[] = { " (including ancestral qgroups)", "-f list all qgroups which impact the given path", " (excluding ancestral qgroups)", - HELPINFO_OUTPUT_UNIT, + HELPINFO_UNITS_LONG, "--sort=qgroupid,rfer,excl,max_rfer,max_excl", " list qgroups sorted by specified items", " you can use '+' or '-' in front of each item.", diff --git a/utils.h b/utils.h index 33b410cf..b6253306 100644 --- a/utils.h +++ b/utils.h @@ -247,7 +247,7 @@ int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features); const char *get_argv0_buf(void); -#define HELPINFO_OUTPUT_UNIT \ +#define HELPINFO_UNITS_LONG \ "--raw raw numbers in bytes", \ "--human-readable human friendly numbers, base 1024 (default)", \ "--iec use 1024 as a base (KiB, MiB, GiB, TiB)", \ @@ -257,7 +257,7 @@ const char *get_argv0_buf(void); "--gbytes show sizes in GiB, or GB with --si", \ "--tbytes show sizes in TiB, or TB with --si" -#define HELPINFO_OUTPUT_UNIT_DF \ +#define HELPINFO_UNITS_SHORT_LONG \ "-b|--raw raw numbers in bytes", \ "-h|--human-readable", \ " human friendly numbers, base 1024 (default)", \