diff options
| author | David Sterba <dsterba@suse.com> | 2015-10-12 00:29:31 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2015-11-02 09:35:04 +0100 |
| commit | be85a75fece2fc226b3ef4d81bd1918c2002cc96 (patch) | |
| tree | 321dbcc6fbb6d6d970c4dd91d6c1c9240a8a7095 | |
| parent | 2b7f0192e84a913119fb3f5652e287909da735c9 (diff) | |
btrfs-progs: extend parse_range API to accept a relaxed range
In some cases we want to accept a range of type [a..a]. Add a new
function to do the 'a < b' check for the caller and use it.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | cmds-balance.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/cmds-balance.c b/cmds-balance.c index d7f81482..053cd9b5 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -128,9 +128,10 @@ static int parse_range(const char *range, u64 *start, u64 *end) return 1; } - if (*start >= *end) { - fprintf(stderr, "Range %llu..%llu doesn't make " - "sense\n", (unsigned long long)*start, + if (*start > *end) { + fprintf(stderr, + "ERROR: range %llu..%llu doesn't make sense\n", + (unsigned long long)*start, (unsigned long long)*end); return 1; } @@ -141,6 +142,25 @@ static int parse_range(const char *range, u64 *start, u64 *end) return 1; } +/* + * Parse range and check if start < end + */ +static int parse_range_strict(const char *range, u64 *start, u64 *end) +{ + if (parse_range(range, start, end) == 0) { + if (*start >= *end) { + fprintf(stderr, + "ERROR: range %llu..%llu not allowed\n", + (unsigned long long)*start, + (unsigned long long)*end); + return 1; + } + return 0; + } + + return 1; +} + static int parse_filters(char *filters, struct btrfs_balance_args *args) { char *this_char; @@ -198,7 +218,7 @@ static int parse_filters(char *filters, struct btrfs_balance_args *args) "an argument\n"); return 1; } - if (parse_range(value, &args->pstart, &args->pend)) { + if (parse_range_strict(value, &args->pstart, &args->pend)) { fprintf(stderr, "Invalid drange argument\n"); return 1; } @@ -209,7 +229,7 @@ static int parse_filters(char *filters, struct btrfs_balance_args *args) "an argument\n"); return 1; } - if (parse_range(value, &args->vstart, &args->vend)) { + if (parse_range_strict(value, &args->vstart, &args->vend)) { fprintf(stderr, "Invalid vrange argument\n"); return 1; } |