Skip to content

L
lxc
Commit e854c5e3 by Serge Hallyn Committed by GitHub
Options

Merge pull request #1151 from brauner/2016-08-26/fix_lxc_device

tools: use boolean for ret in lxc_device.c
parents fe8ded6d 30a5e436
Showing with 1 addition and 3 deletions
src/lxc/tools/lxc_device.c
...@@ -102,7 +102,7 @@ int main(int argc, char *argv[]) ...@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
{ {
struct lxc_container *c; struct lxc_container *c;
char *cmd, *dev_name, *dst_name; char *cmd, *dev_name, *dst_name;
int ret = 1; bool ret = false;
if (geteuid() != 0) { if (geteuid() != 0) {
ERROR("%s must be run as root", argv[0]); ERROR("%s must be run as root", argv[0]);
...@@ -164,7 +164,6 @@ int main(int argc, char *argv[]) ...@@ -164,7 +164,6 @@ int main(int argc, char *argv[])
} }
if (ret != true) { if (ret != true) {
ERROR("Failed to add %s to %s.", dev_name, c->name); ERROR("Failed to add %s to %s.", dev_name, c->name);
ret = 1;
goto err1; goto err1;
} }
INFO("Add %s to %s.", dev_name, c->name); INFO("Add %s to %s.", dev_name, c->name);
...@@ -176,7 +175,6 @@ int main(int argc, char *argv[]) ...@@ -176,7 +175,6 @@ int main(int argc, char *argv[])
} }
if (ret != true) { if (ret != true) {
ERROR("Failed to del %s from %s.", dev_name, c->name); ERROR("Failed to del %s from %s.", dev_name, c->name);
ret = 1;
goto err1; goto err1;
} }
INFO("Delete %s from %s.", dev_name, c->name); INFO("Delete %s from %s.", dev_name, c->name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment