From: Satoru Takeuchi <takeuchi_sat...@jp.fujitsu.com> --- Tested with dev/integration-20141218 + this patch --- cmds-fi-disk_usage.c | 8 ++++---- cmds-filesystem.c | 8 ++++---- utils.h | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c index d81f011..5e8e39b 100644 --- a/cmds-fi-disk_usage.c +++ b/cmds-fi-disk_usage.c @@ -877,8 +877,8 @@ int cmd_filesystem_usage(int argc, char **argv) { "mbytes", no_argument, NULL, 'm'}, { "gbytes", no_argument, NULL, 'g'}, { "tbytes", no_argument, NULL, 't'}, - { "si", no_argument, NULL, 256}, - { "iec", no_argument, NULL, 257}, + { "si", no_argument, NULL, GETOPT_VAL_SI}, + { "iec", no_argument, NULL, GETOPT_VAL_IEC}, }; int c = getopt_long(argc, argv, "bhHkmgtT", long_options, &long_index); @@ -907,10 +907,10 @@ int cmd_filesystem_usage(int argc, char **argv) case 'H': unit_mode = UNITS_HUMAN_DECIMAL; break; - case 256: + case GETOPT_VAL_SI: units_set_mode(&unit_mode, UNITS_DECIMAL); break; - case 257: + case GETOPT_VAL_IEC: units_set_mode(&unit_mode, UNITS_BINARY); break; case 'T': diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 7eaccb9..8f037dd 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -216,8 +216,8 @@ static int cmd_filesystem_df(int argc, char **argv) { "mbytes", no_argument, NULL, 'm'}, { "gbytes", no_argument, NULL, 'g'}, { "tbytes", no_argument, NULL, 't'}, - { "si", no_argument, NULL, 256}, - { "iec", no_argument, NULL, 257}, + { "si", no_argument, NULL, GETOPT_VAL_SI}, + { "iec", no_argument, NULL, GETOPT_VAL_IEC}, }; int c = getopt_long(argc, argv, "bhHkmgt", long_options, &long_index); @@ -245,10 +245,10 @@ static int cmd_filesystem_df(int argc, char **argv) case 'H': unit_mode = UNITS_HUMAN_DECIMAL; break; - case 256: + case GETOPT_VAL_SI: units_set_mode(&unit_mode, UNITS_DECIMAL); break; - case 257: + case GETOPT_VAL_IEC: units_set_mode(&unit_mode, UNITS_BINARY); break; default: diff --git a/utils.h b/utils.h index 0464c2d..34fd5e4 100644 --- a/utils.h +++ b/utils.h @@ -40,6 +40,9 @@ #define ARGV0_BUF_SIZE PATH_MAX +#define GETOPT_VAL_SI 256 +#define GETOPT_VAL_IEC 257 + int check_argc_exact(int nargs, int expected); int check_argc_min(int nargs, int expected); int check_argc_max(int nargs, int expected); -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html