libkmod: rename/reuse xz_error()

Swap "belch" for a more common name and use the function in all possible
error paths.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/452
Signed-off-by: Lucas De Marchi <demarchi@kernel.org>

diff --git a/libkmod/libkmod-file-xz.c b/libkmod/libkmod-file-xz.c
index 432a6473016ed3e751dc5feb2ec62878a899e6f7..38ba921d81987f7aae5e57c6969630b4ff3e70a2 100644 (file)
--- a/libkmod/libkmod-file-xz.c
+++ b/libkmod/libkmod-file-xz.c
@@ -42,7 +42,7 @@ static int dlopen_lzma(void)
 #endif
 }
 
-static void xz_uncompress_belch(struct kmod_file *file, lzma_ret ret)
+static void xz_error(struct kmod_file *file, lzma_ret ret)
 {
        switch (ret) {
        case LZMA_MEM_ERROR:
@@ -107,7 +107,7 @@ static int xz_uncompress(lzma_stream *strm, struct kmod_file *file)
                if (ret == LZMA_STREAM_END)
                        break;
                if (ret != LZMA_OK) {
-                       xz_uncompress_belch(file, ret);
+                       xz_error(file, ret);
                        ret = -EINVAL;
                        goto out;
                }
@@ -134,10 +134,10 @@ int kmod_file_load_xz(struct kmod_file *file)
 
        lzret = sym_lzma_stream_decoder(&strm, UINT64_MAX, LZMA_CONCATENATED);
        if (lzret == LZMA_MEM_ERROR) {
-               ERR(file->ctx, "xz: %s\n", strerror(ENOMEM));
+               xz_error(file, lzret);
                return -ENOMEM;
        } else if (lzret != LZMA_OK) {
-               ERR(file->ctx, "xz: Internal error (bug)\n");
+               xz_error(file, lzret);
                return -EINVAL;
        }
        ret = xz_uncompress(&strm, file);