From 7f53d2785816e5b65dfdb0daa4039249569e58f9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 28 Nov 2019 16:11:22 +0100 Subject: Cleanup: Return combined return value from compressor id by name Instead of returning the ID through a pointer and an error code as return status, return a single int that could be a compressor ID (positive values) or an error code (negative values). Signed-off-by: David Oberhollenzer --- tar/tar2sqfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tar') diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c index 0076537..56ae5dc 100644 --- a/tar/tar2sqfs.c +++ b/tar/tar2sqfs.c @@ -97,7 +97,7 @@ static FILE *input_file = NULL; static void process_args(int argc, char **argv) { bool have_compressor; - int i; + int i, ret; sqfs_writer_cfg_init(&cfg); @@ -120,23 +120,23 @@ static void process_args(int argc, char **argv) break; case 'c': have_compressor = true; + ret = sqfs_compressor_id_from_name(optarg); - if (sqfs_compressor_id_from_name(optarg, &cfg.comp_id)) + if (ret < 0) { have_compressor = false; - - if (!sqfs_compressor_exists(cfg.comp_id)) - have_compressor = false; - #ifdef WITH_LZO - if (cfg.comp_id == SQFS_COMP_LZO) - have_compressor = true; + if (cfg.comp_id == SQFS_COMP_LZO) + have_compressor = true; #endif + } if (!have_compressor) { fprintf(stderr, "Unsupported compressor '%s'\n", optarg); exit(EXIT_FAILURE); } + + cfg.comp_id = ret; break; case 'j': cfg.num_jobs = strtol(optarg, NULL, 0); -- cgit v1.2.3