aboutsummaryrefslogtreecommitdiff
path: root/mkfs
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-05 18:46:50 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-05 18:46:50 +0200
commit320ae4f8e752f6652c7b5c8201d7267cd4de17c1 (patch)
tree4423514c5433dc3b70e32fd5950a139827b94ac9 /mkfs
parentf92cf3b98f51d355c92900f1d316b141b2b9d4fd (diff)
Cleanup naming scheme of compressor
Add sqfs_* prefix to compressor, move implementation prefix up front. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'mkfs')
-rw-r--r--mkfs/mkfs.c6
-rw-r--r--mkfs/options.c6
2 files changed, 7 insertions, 5 deletions
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) {