From: AustinReichert Date: Tue, 28 Nov 2017 22:56:17 +0000 (-0600) Subject: tools/lxc_copy: remove internal logging X-Git-Tag: lxc-3.0.0.beta1~164^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1973%2Fhead;p=thirdparty%2Flxc.git tools/lxc_copy: remove internal logging Signed-off-by: AustinReichert --- diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c index 7eddb77d6..3321434aa 100644 --- a/src/lxc/tools/lxc_copy.c +++ b/src/lxc/tools/lxc_copy.c @@ -50,8 +50,6 @@ #include <../include/getsubopt.h> #endif -lxc_log_define(lxc_copy_ui, lxc); - enum mnttype { LXC_MNT_BIND, LXC_MNT_AUFS, @@ -394,8 +392,6 @@ static int do_clone(struct lxc_container *c, char *newname, char *newpath, return -1; } - INFO("Created %s as %s of %s\n", newname, task ? "snapshot" : "copy", c->name); - lxc_container_put(clone); return 0; @@ -515,12 +511,10 @@ destroy_and_put: static int do_clone_rename(struct lxc_container *c, char *newname) { if (!c->rename(c, newname)) { - ERROR("Error: Renaming container %s to %s failed\n", c->name, newname); + fprintf(stderr, "Error: Renaming container %s to %s failed\n", c->name, newname); return -1; } - INFO("Renamed container %s to %s\n", c->name, newname); - return 0; } @@ -679,7 +673,7 @@ static int parse_aufs_mnt(char *mntstring, enum mnttype type) else if (len == 2) /* aufs=src:dest */ m->dest = construct_path(mntarray[1], false); else - INFO("Excess elements in mount specification"); + printf("Excess elements in mount specification\n"); if (!m->dest) goto err; @@ -733,7 +727,7 @@ static int parse_bind_mnt(char *mntstring, enum mnttype type) m->dest = construct_path(mntarray[1], false); m->options = strdup(mntarray[2]); } else { - INFO("Excess elements in mount specification"); + printf("Excess elements in mount specification\n"); } if (!m->dest) @@ -802,7 +796,7 @@ static int parse_ovl_mnt(char *mntstring, enum mnttype type) else if (len == 2) /* overlay=src:dest */ m->dest = construct_path(mntarray[1], false); else - INFO("Excess elements in mount specification"); + printf("Excess elements in mount specification\n"); if (!m->dest) goto err; @@ -863,7 +857,7 @@ static char *mount_tmpfs(const char *oldname, const char *newname, goto err_free; if (fcntl(fd, F_SETFD, FD_CLOEXEC)) { - SYSERROR("Failed to set close-on-exec on file descriptor."); + fprintf(stderr, "Failed to set close-on-exec on file descriptor.\n"); goto err_close; }