diff options
| author | David Sterba <dsterba@suse.com> | 2016-09-06 13:27:03 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-09-21 14:12:38 +0200 |
| commit | 1620e2a0421a6e5881a3bb4a739bace929671441 (patch) | |
| tree | 85a2f3fe5e8008c5d997ec220b29c9cce3add46f /btrfs-list.c | |
| parent | 40ca1d513d97c71aad79953bbc3bb56ddea7adc5 (diff) | |
btrfs-progs: switch column values to asserts
This is checking correct usage, not runtime errors.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'btrfs-list.c')
| -rw-r--r-- | btrfs-list.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/btrfs-list.c b/btrfs-list.c index 4cc2ed49..b9d82e42 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -113,7 +113,7 @@ void btrfs_list_setup_print_column(enum btrfs_list_column_enum column) { int i; - BUG_ON(column < 0 || column > BTRFS_LIST_ALL); + ASSERT(0 <= column && column <= BTRFS_LIST_ALL); if (column < BTRFS_LIST_ALL) { btrfs_list_columns[column].need_print = 1; @@ -248,9 +248,9 @@ static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set, struct btrfs_list_comparer_set *set = *comp_set; int size; - BUG_ON(!set); - BUG_ON(comparer >= BTRFS_LIST_COMP_MAX); - BUG_ON(set->ncomps > set->total); + ASSERT(set != NULL); + ASSERT(comparer < BTRFS_LIST_COMP_MAX); + ASSERT(set->ncomps <= set->total); if (set->ncomps == set->total) { void *tmp; @@ -272,7 +272,7 @@ static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set, *comp_set = set; } - BUG_ON(set->comps[set->ncomps].comp_func); + ASSERT(set->comps[set->ncomps].comp_func == NULL); set->comps[set->ncomps].comp_func = all_comp_funcs[comparer]; set->comps[set->ncomps].is_descending = is_descending; @@ -1220,9 +1220,9 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, struct btrfs_list_filter_set *set = *filter_set; int size; - BUG_ON(!set); - BUG_ON(filter >= BTRFS_LIST_FILTER_MAX); - BUG_ON(set->nfilters > set->total); + ASSERT(set != NULL); + ASSERT(filter < BTRFS_LIST_FILTER_MAX); + ASSERT(set->nfilters <= set->total); if (set->nfilters == set->total) { void *tmp; @@ -1244,7 +1244,7 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, *filter_set = set; } - BUG_ON(set->filters[set->nfilters].filter_func); + ASSERT(set->filters[set->nfilters].filter_func == NULL); if (filter == BTRFS_LIST_FILTER_DELETED) set->only_deleted = 1; @@ -1331,7 +1331,7 @@ static void print_subvolume_column(struct root_info *subv, char tstr[256]; char uuidparse[BTRFS_UUID_UNPARSED_SIZE]; - BUG_ON(column >= BTRFS_LIST_ALL || column < 0); + ASSERT(0 <= column && column < BTRFS_LIST_ALL); switch (column) { case BTRFS_LIST_OBJECTID: |