From: AustinReichert <austinskyreichert@utexas.edu>
Date: Tue, 28 Nov 2017 22:59:14 +0000 (-0600)
Subject: tools/lxc_monitor: removed internal logging
X-Git-Tag: lxc-2.0.10~547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dba1ad7f214f8ffadcdca0243e299c8cd3f63ff;p=thirdparty%2Flxc.git

tools/lxc_monitor: removed internal logging

Signed-off-by: AustinReichert <austinskyreichert@utexas.edu>
---

diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c
index 7be26bf7c..683df6461 100644
--- a/src/lxc/tools/lxc_monitor.c
+++ b/src/lxc/tools/lxc_monitor.c
@@ -37,8 +37,6 @@
 #include "arguments.h"
 #include "lxccontainer.h"
 
-lxc_log_define(lxc_monitor_ui, lxc);
-
 static bool quit_monitord;
 
 static int my_parser(struct lxc_arguments* args, int c, char* arg)
@@ -120,12 +118,12 @@ int main(int argc, char *argv[])
 
 			fd = lxc_monitor_open(my_args.lxcpath[i]);
 			if (fd < 0) {
-				ERROR("Unable to open monitor on path: %s", my_args.lxcpath[i]);
+				fprintf(stderr, "Unable to open monitor on path: %s\n", my_args.lxcpath[i]);
 				ret = EXIT_FAILURE;
 				continue;
 			}
 			if (write(fd, "quit", 4) < 0) {
-				SYSERROR("Unable to close monitor on path: %s", my_args.lxcpath[i]);
+				fprintf(stderr, "Unable to close monitor on path: %s\n", my_args.lxcpath[i]);
 				ret = EXIT_FAILURE;
 				close(fd);
 				continue;
@@ -138,23 +136,23 @@ int main(int argc, char *argv[])
 	len = strlen(my_args.name) + 3;
 	regexp = malloc(len + 3);
 	if (!regexp) {
-		ERROR("failed to allocate memory");
+		fprintf(stderr, "failed to allocate memory\n");
 		exit(rc_main);
 	}
 	rc_snp = snprintf(regexp, len, "^%s$", my_args.name);
 	if (rc_snp < 0 || rc_snp >= len) {
-		ERROR("Name too long");
+		fprintf(stderr, "Name too long\n");
 		goto error;
 	}
 
 	if (regcomp(&preg, regexp, REG_NOSUB|REG_EXTENDED)) {
-		ERROR("failed to compile the regex '%s'", my_args.name);
+		fprintf(stderr, "failed to compile the regex '%s'\n", my_args.name);
 		goto error;
 	}
 
 	fds = malloc(my_args.lxcpath_cnt * sizeof(struct pollfd));
 	if (!fds) {
-		SYSERROR("out of memory");
+		fprintf(stderr, "out of memory\n");
 		goto cleanup;
 	}