From 85e36aab1258d8d9ec7b61ce013f167ef8e03ae0 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 5 Mar 2020 22:38:15 +0100 Subject: Change the signature of sqfs_compressor_create to return an error code Make sure the function has a way of telling the caller *why* it failed. This way, the function can convey whether it had an internal error, an allocation failure, whether the arguments are totaly nonsensical, or simply that the compressor *or specific configuration* is not supported. Signed-off-by: David Oberhollenzer --- difftool/sqfsdiff.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'difftool') diff --git a/difftool/sqfsdiff.c b/difftool/sqfsdiff.c index c5d2bf2..6415165 100644 --- a/difftool/sqfsdiff.c +++ b/difftool/sqfsdiff.c @@ -39,15 +39,15 @@ static int open_sfqs(sqfs_state_t *state, const char *path) state->super.block_size, SQFS_COMP_FLAG_UNCOMPRESS); - state->cmp = sqfs_compressor_create(&state->cfg); + ret = sqfs_compressor_create(&state->cfg, &state->cmp); #ifdef WITH_LZO - if (state->super.compression_id == SQFS_COMP_LZO && state->cmp == NULL) - state->cmp = lzo_compressor_create(&state->cfg); + if (state->super.compression_id == SQFS_COMP_LZO && ret != 0) + ret = lzo_compressor_create(&state->cfg, &state->cmp); #endif - if (state->cmp == NULL) { - fprintf(stderr, "%s: error creating compressor.\n", path); + if (ret != 0) { + sqfs_perror(path, "creating compressor", ret); goto fail_file; } -- cgit v1.2.3