New function to enable suppression of messages to stdout/stderr.

lib/log/log.c

@@ -17,139 +17,162 @@ static int _debug_level = 0;
 static int _syslog = 0;
 static int _indent = 1;
 static int _log_cmd_name = 0;
+static int _log_suppress = 0;
 static char _cmd_name[30] = "";
 static char _msg_prefix[30] = "  ";
 
-void init_log(FILE *fp) {
+void init_log(FILE * fp)
+{
 	_log = fp;
 }
 
-void init_syslog(int facility) {
+void init_syslog(int facility)
+{
 	openlog("lvm", LOG_PID, facility);
 	_syslog = 1;
 }
 
-void fin_log() {
+void log_suppress(int suppress)
+{
+	_log_suppress = suppress;
+}
+
+void fin_log()
+{
 	_log = 0;
 }
 
-void fin_syslog() {
+void fin_syslog()
+{
 	if (_syslog)
 		closelog();
 	_syslog = 0;
 }
 
-void init_verbose(int level) {
+void init_verbose(int level)
+{
 	_verbose_level = level;
 }
 
-void init_test(int level) {
+void init_test(int level)
+{
 	_test = level;
 	if (_test)
 		log_print("Test mode. Metadata will NOT be updated.");
 }
 
-void init_partial(int level) {
+void init_partial(int level)
+{
 	_partial = level;
 }
 
-void init_cmd_name(int status) {
+void init_cmd_name(int status)
+{
 	_log_cmd_name = status;
 }
 
-void set_cmd_name(const char *cmd) {
+void set_cmd_name(const char *cmd)
+{
 	if (!_log_cmd_name)
 		return;
 	strncpy(_cmd_name, cmd, sizeof(_cmd_name));
 	_cmd_name[sizeof(_cmd_name) - 1] = '\0';
 }
 
-void init_msg_prefix(const char *prefix) {
+void init_msg_prefix(const char *prefix)
+{
 	strncpy(_msg_prefix, prefix, sizeof(_msg_prefix));
 	_msg_prefix[sizeof(_msg_prefix) - 1] = '\0';
 }
 
-void init_indent(int indent) {
+void init_indent(int indent)
+{
 	_indent = indent;
 }
 
-int test_mode() {
+int test_mode()
+{
 	return _test;
 }
 
-int partial_mode() {
+int partial_mode()
+{
 	return _partial;
 }
 
-void init_debug(int level) {
+void init_debug(int level)
+{
 	_debug_level = level;
 }
 
-int debug_level() {
+int debug_level()
+{
 	return _debug_level;
 }
 
-void print_log(int level, const char *file, int line, const char *format, ...) {
+void print_log(int level, const char *file, int line, const char *format, ...)
+{
 	va_list ap;
 
-	va_start(ap, format);
-	switch(level) {
-	  case _LOG_DEBUG:
-		if (!strcmp("<backtrace>", format))
+	if (!_log_suppress) {
+		va_start(ap, format);
+		switch (level) {
+		case _LOG_DEBUG:
+			if (!strcmp("<backtrace>", format))
+				break;
+			if (_verbose_level > 2) {
+				printf("%s%s", _cmd_name, _msg_prefix);
+				if (_indent)
+					printf("      ");
+				vprintf(format, ap);
+				putchar('\n');
+			}
 			break;
-		if (_verbose_level > 2) {
-			printf("%s%s", _cmd_name, _msg_prefix);
-			if (_indent)
-				printf("      ");
-			vprintf(format, ap);
-			putchar('\n');
-		}
-		break;
 
-	  case _LOG_INFO:
-		if (_verbose_level > 1) {
+		case _LOG_INFO:
+			if (_verbose_level > 1) {
+				printf("%s%s", _cmd_name, _msg_prefix);
+				if (_indent)
+					printf("    ");
+				vprintf(format, ap);
+				putchar('\n');
+			}
+			break;
+		case _LOG_NOTICE:
+			if (_verbose_level) {
+				printf("%s%s", _cmd_name, _msg_prefix);
+				if (_indent)
+					printf("  ");
+				vprintf(format, ap);
+				putchar('\n');
+			}
+			break;
+		case _LOG_WARN:
 			printf("%s%s", _cmd_name, _msg_prefix);
-			if (_indent)
-				printf("    ");
 			vprintf(format, ap);
 			putchar('\n');
+			break;
+		case _LOG_ERR:
+			fprintf(stderr, "%s%s", _cmd_name, _msg_prefix);
+			vfprintf(stderr, format, ap);
+			fputc('\n', stderr);
+			break;
+		case _LOG_FATAL:
+		default:
+			fprintf(stderr, "%s%s", _cmd_name, _msg_prefix);
+			vfprintf(stderr, format, ap);
+			fputc('\n', stderr);
+			break;
+			;
 		}
-		break;
-	  case _LOG_NOTICE:
-		if (_verbose_level) {
-			printf("%s%s", _cmd_name, _msg_prefix);
-			if (_indent)
-				printf("  ");
-			vprintf(format, ap);
-			putchar('\n');
-		}
-		break;
-	  case _LOG_WARN:
-		printf("%s%s", _cmd_name, _msg_prefix);
-		vprintf(format, ap);
-		putchar('\n');
-		break;
-	  case _LOG_ERR:
-		fprintf(stderr, "%s%s", _cmd_name, _msg_prefix);
-		vfprintf(stderr, format, ap);
-		fputc('\n',stderr);
-		break;
-	  case _LOG_FATAL:
-	  default:
-		fprintf(stderr, "%s%s", _cmd_name, _msg_prefix);
-		vfprintf(stderr, format, ap);
-		fputc('\n',stderr);
-		break;
-		;
+		va_end(ap);
 	}
-	va_end(ap);
 
 	if (level > _debug_level)
 		return;
 
 	if (_log) {
-		fprintf(_log, "%s:%d %s%s", file, line, _cmd_name, 
-			_msg_prefix);
+		fprintf(_log, "%s:%d %s%s", file, line, _cmd_name, _msg_prefix);
 
 		va_start(ap, format);
 		vfprintf(_log, format, ap);
@@ -160,9 +183,8 @@ void print_log(int level, const char *file, int line, const char *format, ...) {
 	}
 
 	if (_syslog) {
-        	va_start(ap, format);
+		va_start(ap, format);
 		vsyslog(level, format, ap);
 		va_end(ap);
 	}
 }
-

lib/log/log.h

@@ -59,6 +59,9 @@ int test_mode(void);
 int partial_mode(void);
 int debug_level(void);
 
+/* Suppress messages to stdout/stderr */
+void log_suppress(int suppress);
+
 void print_log(int level, const char *file, int line, const char *format, ...)
      __attribute__ (( format (printf, 4, 5) ));