btrfs-progs: switch column values to asserts

This is checking correct usage, not runtime errors.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/btrfs-list.c b/btrfs-list.c
index 4cc2ed4..b9d82e4 100644 (file)
--- 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:

diff --git a/qgroup.c b/qgroup.c
index f17fdae..6a6cdd9 100644 (file)
--- a/qgroup.c
+++ b/qgroup.c
@@ -148,7 +148,7 @@ void btrfs_qgroup_setup_print_column(enum btrfs_qgroup_column_enum column)
 {
        int i;
 
-       BUG_ON(column < 0 || column > BTRFS_QGROUP_ALL);
+       ASSERT(0 <= column && column <= BTRFS_QGROUP_ALL);
 
        if (column < BTRFS_QGROUP_ALL) {
                btrfs_qgroup_columns[column].need_print = 1;
@@ -213,11 +213,12 @@ static void print_qgroup_column_add_blank(enum btrfs_qgroup_column_enum column,
 static void print_qgroup_column(struct btrfs_qgroup *qgroup,
                                enum btrfs_qgroup_column_enum column)
 {
-       BUG_ON(column >= BTRFS_QGROUP_ALL || column < 0);
        int len;
        int unit_mode = btrfs_qgroup_columns[column].unit_mode;
        int max_len = btrfs_qgroup_columns[column].max_len;
 
+       ASSERT(0 <= column && column < BTRFS_QGROUP_ALL);
+
        switch (column) {
 
        case BTRFS_QGROUP_QGROUPID:
@@ -459,9 +460,9 @@ int btrfs_qgroup_setup_comparer(struct btrfs_qgroup_comparer_set  **comp_set,
        struct btrfs_qgroup_comparer_set *set = *comp_set;
        int size;
 
-       BUG_ON(!set);
-       BUG_ON(comparer >= BTRFS_QGROUP_COMP_MAX);
-       BUG_ON(set->ncomps > set->total);
+       ASSERT(set != NULL);
+       ASSERT(comparer < BTRFS_QGROUP_COMP_MAX);
+       ASSERT(set->ncomps <= set->total);
 
        if (set->ncomps == set->total) {
                void *tmp;
@@ -484,7 +485,7 @@ int btrfs_qgroup_setup_comparer(struct btrfs_qgroup_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;
@@ -832,9 +833,9 @@ int btrfs_qgroup_setup_filter(struct btrfs_qgroup_filter_set **filter_set,
        struct btrfs_qgroup_filter_set *set = *filter_set;
        int size;
 
-       BUG_ON(!set);
-       BUG_ON(filter >= BTRFS_QGROUP_FILTER_MAX);
-       BUG_ON(set->nfilters > set->total);
+       ASSERT(set != NULL);
+       ASSERT(filter < BTRFS_QGROUP_FILTER_MAX);
+       ASSERT(set->nfilters <= set->total);
 
        if (set->nfilters == set->total) {
                void *tmp;
@@ -855,7 +856,8 @@ int btrfs_qgroup_setup_filter(struct btrfs_qgroup_filter_set **filter_set,
                set->total += BTRFS_QGROUP_NFILTERS_INCREASE;
                *filter_set = set;
        }
-       BUG_ON(set->filters[set->nfilters].filter_func);
+
+       ASSERT(set->filters[set->nfilters].filter_func != NULL);
        set->filters[set->nfilters].filter_func = all_filter_funcs[filter];
        set->filters[set->nfilters].data = data;
        set->nfilters++;
@@ -926,12 +928,13 @@ static int sort_tree_insert(struct qgroup_lookup *sort_tree,
 static void __update_columns_max_len(struct btrfs_qgroup *bq,
                                     enum btrfs_qgroup_column_enum column)
 {
-       BUG_ON(column >= BTRFS_QGROUP_ALL || column < 0);
        struct btrfs_qgroup_list *list = NULL;
        char tmp[100];
        int len;
        unsigned unit_mode = btrfs_qgroup_columns[column].unit_mode;
 
+       ASSERT(0 <= column && column < BTRFS_QGROUP_ALL);
+
        switch (column) {
 
        case BTRFS_QGROUP_QGROUPID: