From f1f478ff7b9a7579cdfea5674be2050035edd48a Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 31 Oct 2016 11:51:54 +0100 Subject: btrfs-progs: return void from btrfs_list_setup_filter As an early setup function, failure uisng exit is ok. Signed-off-by: David Sterba --- btrfs-list.c | 7 +++++-- btrfs-list.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/btrfs-list.c b/btrfs-list.c index ce045813..4a2476b7 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -1197,7 +1197,11 @@ struct btrfs_list_filter_set *btrfs_list_alloc_filter_set(void) return set; } -int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, +/* + * Setup list filters. Exit if there's not enough memory, as we can't continue + * without the structures set up properly. + */ +void btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, enum btrfs_list_filter_enum filter, u64 data) { struct btrfs_list_filter_set *set = *filter_set; @@ -1235,7 +1239,6 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, set->filters[set->nfilters].filter_func = all_filter_funcs[filter]; set->filters[set->nfilters].data = data; set->nfilters++; - return 0; } static int filter_root(struct root_info *ri, diff --git a/btrfs-list.h b/btrfs-list.h index a39a01a0..528d5a98 100644 --- a/btrfs-list.h +++ b/btrfs-list.h @@ -162,7 +162,7 @@ int btrfs_list_parse_filter_string(char *optarg, enum btrfs_list_filter_enum type); void btrfs_list_setup_print_column(enum btrfs_list_column_enum column); struct btrfs_list_filter_set *btrfs_list_alloc_filter_set(void); -int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, +void btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set, enum btrfs_list_filter_enum filter, u64 data); struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void); -- cgit v1.2.3