proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 16:18:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2998 from rikardfalkeborn/fix-returning-non-bool

Browse Source 
Fix returning -1 in functions with return type bool
This commit is contained in:
Christian Brauner 2019-05-13 13:19:22 +02:00 committed by GitHub
commit 7d4188ce71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lxc/criu.c
View File

@ -1273,7 +1273,6 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op
if (!cgroup_ops) { if (!cgroup_ops) {
ERROR("failed to cgroup_init()"); ERROR("failed to cgroup_init()");
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
return -1;
} }
os.pipefd = criuout[1]; os.pipefd = criuout[1];

8
src/lxc/storage/lvm.c
View File

@ -535,13 +535,13 @@ bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig,
if (!newsize && blk_getsize(orig, &size) < 0) { if (!newsize && blk_getsize(orig, &size) < 0) {
ERROR("Failed to detect size of logical volume \"%s\"", ERROR("Failed to detect size of logical volume \"%s\"",
orig->src); orig->src);
return -1; return false;
} }
/* detect filesystem */ /* detect filesystem */
if (detect_fs(orig, fstype, 100) < 0) { if (detect_fs(orig, fstype, 100) < 0) {
INFO("Failed to detect filesystem type for \"%s\"", orig->src); INFO("Failed to detect filesystem type for \"%s\"", orig->src);
return -1; return false;
} }
} else if (!newsize) { } else if (!newsize) {
size = DEFAULT_FS_SIZE; 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); ret = do_lvm_create(src, size, thinpool);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to create lvm storage volume \"%s\"", src); ERROR("Failed to create lvm storage volume \"%s\"", src);
return -1; return false;
} }
cmd_args[0] = fstype; cmd_args[0] = fstype;
@ -563,7 +563,7 @@ bool lvm_create_clone(struct lxc_conf *conf, struct lxc_storage *orig,
if (ret < 0) { if (ret < 0) {
ERROR("Failed to create new filesystem \"%s\" for lvm storage " ERROR("Failed to create new filesystem \"%s\" for lvm storage "
"volume \"%s\": %s", fstype, src, cmd_output); "volume \"%s\": %s", fstype, src, cmd_output);
return -1; return false;
} }
data.orig = orig; data.orig = orig;

2
src/lxc/storage/zfs.c
View File

@ -427,7 +427,7 @@ bool zfs_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
if (ret < 0 || ret >= PATH_MAX) { if (ret < 0 || ret >= PATH_MAX) {
ERROR("Failed to create string"); ERROR("Failed to create string");
free(snapshot); free(snapshot);
return -1; return false;
} }
cmd_args.dataset = lxc_storage_get_path(new->src, new->type); cmd_args.dataset = lxc_storage_get_path(new->src, new->type);