From 320ae4f8e752f6652c7b5c8201d7267cd4de17c1 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 5 Sep 2019 18:46:50 +0200 Subject: Cleanup naming scheme of compressor Add sqfs_* prefix to compressor, move implementation prefix up front. Signed-off-by: David Oberhollenzer --- mkfs/mkfs.c | 6 +++--- mkfs/options.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'mkfs') diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c index abd7422..540dbea 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -93,11 +93,11 @@ static int read_fstree(fstree_t *fs, options_t *opt) int main(int argc, char **argv) { int status = EXIT_FAILURE, ret; - compressor_config_t cfg; + sqfs_compressor_config_t cfg; + sqfs_compressor_t *cmp; sqfs_id_table_t *idtbl; data_writer_t *data; sqfs_super_t super; - compressor_t *cmp; options_t opt; fstree_t fs; int outfd; @@ -151,7 +151,7 @@ int main(int argc, char **argv) fstree_xattr_deduplicate(&fs); - cmp = compressor_create(&cfg); + cmp = sqfs_compressor_create(&cfg); if (cmp == NULL) { fputs("Error creating compressor\n", stderr); goto out_outfd; diff --git a/mkfs/options.c b/mkfs/options.c index fb50d7b..9e747d8 100644 --- a/mkfs/options.c +++ b/mkfs/options.c @@ -161,10 +161,12 @@ void process_command_line(options_t *opt, int argc, char **argv) case 'c': have_compressor = true; - if (compressor_id_from_name(optarg, &opt->compressor)) + if (sqfs_compressor_id_from_name(optarg, + &opt->compressor)) { have_compressor = false; + } - if (!compressor_exists(opt->compressor)) + if (!sqfs_compressor_exists(opt->compressor)) have_compressor = false; if (!have_compressor) { -- cgit v1.2.3