From acefefce61610029e06d761e93c326e8921705b9 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 29 Sep 2021 18:33:25 +0200 Subject: [PATCH] btrfs-progs: subvol list: copy btrfs_list_alloc_comparer_set from btrfs-list.c There's only one caller of btrfs_list_alloc_comparer_set so move it there. Also move the definitions of BTRFS_LIST_* to the header so they can be used by both btrfs-list and subvolume.c. Signed-off-by: David Sterba --- btrfs-list.c | 21 --------------------- btrfs-list.h | 4 +++- cmds/subvolume-list.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/btrfs-list.c b/btrfs-list.c index 75411e6d..75bbe6f6 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -34,9 +34,6 @@ #include "btrfs-list.h" #include "common/rbtree-utils.h" -#define BTRFS_LIST_NFILTERS_INCREASE (2 * BTRFS_LIST_FILTER_MAX) -#define BTRFS_LIST_NCOMPS_INCREASE (2 * BTRFS_LIST_COMP_MAX) - /* we store all the roots we find in an rbtree so that we can * search for them later. */ @@ -224,24 +221,6 @@ static int btrfs_list_get_sort_item(char *sort_name) return -1; } -struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void) -{ - struct btrfs_list_comparer_set *set; - int size; - - size = sizeof(struct btrfs_list_comparer_set) + - BTRFS_LIST_NCOMPS_INCREASE * sizeof(struct btrfs_list_comparer); - set = calloc(1, size); - if (!set) { - fprintf(stderr, "memory allocation failed\n"); - exit(1); - } - - set->total = BTRFS_LIST_NCOMPS_INCREASE; - - return set; -} - static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set, enum btrfs_list_comp_enum comparer, int is_descending) { diff --git a/btrfs-list.h b/btrfs-list.h index 5f143fa8..c2066402 100644 --- a/btrfs-list.h +++ b/btrfs-list.h @@ -24,6 +24,9 @@ #include "ioctl.h" #include +#define BTRFS_LIST_NFILTERS_INCREASE (2 * BTRFS_LIST_FILTER_MAX) +#define BTRFS_LIST_NCOMPS_INCREASE (2 * BTRFS_LIST_COMP_MAX) + enum btrfs_list_layout { BTRFS_LIST_LAYOUT_DEFAULT = 0, BTRFS_LIST_LAYOUT_TABLE, @@ -157,7 +160,6 @@ void btrfs_list_setup_print_column(enum btrfs_list_column_enum column); struct btrfs_list_filter_set *btrfs_list_alloc_filter_set(void); 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); int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set, struct btrfs_list_comparer_set *comp_set, diff --git a/cmds/subvolume-list.c b/cmds/subvolume-list.c index ec1dc025..d8d8cd62 100644 --- a/cmds/subvolume-list.c +++ b/cmds/subvolume-list.c @@ -69,6 +69,24 @@ static const char * const cmd_subvol_list_usage[] = { NULL, }; +static struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void) +{ + struct btrfs_list_comparer_set *set; + int size; + + size = sizeof(struct btrfs_list_comparer_set) + + BTRFS_LIST_NCOMPS_INCREASE * sizeof(struct btrfs_list_comparer); + set = calloc(1, size); + if (!set) { + fprintf(stderr, "memory allocation failed\n"); + exit(1); + } + + set->total = BTRFS_LIST_NCOMPS_INCREASE; + + return set; +} + static int cmd_subvol_list(const struct cmd_struct *cmd, int argc, char **argv) { struct btrfs_list_filter_set *filter_set;