From 4d927e7f424acc3002531b10af190a947f123ca0 Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sun, 12 May 2019 01:46:27 +0200 Subject: [PATCH] lvm: Fix return value if lvm_create_clone fails Returning -1 in a function with return type bool is the same as returning true. Change to return false to indicate error properly. Detected with cppcheck. Signed-off-by: Rikard Falkeborn --- src/lxc/storage/lvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/storage/lvm.c b/src/lxc/storage/lvm.c index e30f82160..cc267b952 100644 --- a/src/lxc/storage/lvm.c +++ b/src/lxc/storage/lvm.c @@ -535,13 +535,13 @@ bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig, if (!newsize && blk_getsize(orig, &size) < 0) { ERROR("Failed to detect size of logical volume \"%s\"", orig->src); - return -1; + return false; } /* detect filesystem */ if (detect_fs(orig, fstype, 100) < 0) { INFO("Failed to detect filesystem type for \"%s\"", orig->src); - return -1; + return false; } } else if (!newsize) { size = DEFAULT_FS_SIZE; @@ -553,7 +553,7 @@ bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig, ret = do_lvm_create(src, size, thinpool); if (ret < 0) { ERROR("Failed to create lvm storage volume \"%s\"", src); - return -1; + return false; } cmd_args[0] = fstype; @@ -563,7 +563,7 @@ bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig, if (ret < 0) { ERROR("Failed to create new filesystem \"%s\" for lvm storage " "volume \"%s\": %s", fstype, src, cmd_output); - return -1; + return false; } data.orig = orig; -- 2.47.2