Fix so only log_error and log_fatal set EUNCLASSIFIED.

diff --git a/lib/log/log.c b/lib/log/log.c
index dc3909f5bb46542f1ad11c8e47425dd670b85447..1a7da46341911786eedb68145329a7a1e44971cb 100644 (file)
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -186,7 +186,7 @@ void print_log(int level, const char *file, int line, int dm_errno,
        if (dm_errno && !_lvm_errno)
                _lvm_errno = dm_errno;
 
-       if (_lvm2_log_fn || (_store_errmsg && (level == _LOG_ERR))) {
+       if (_lvm2_log_fn || (_store_errmsg && (level <= _LOG_ERR))) {
                va_start(ap, format);
                n = vsnprintf(buf2, sizeof(buf2) - 1, trformat, ap);
                va_end(ap);
@@ -201,7 +201,7 @@ void print_log(int level, const char *file, int line, int dm_errno,
                message = &buf2[0];
        }
 
-       if (_store_errmsg && (level == _LOG_ERR)) {
+       if (_store_errmsg && (level <= _LOG_ERR)) {
                if (!_lvm_errmsg)
                        _lvm_errmsg = dm_strdup(message);
                else if ((newbuf = dm_realloc(_lvm_errmsg,

diff --git a/lib/log/log.h b/lib/log/log.h
index 56360880356d03c81b941665bd1a5e450d0ab370..9509e957e87dc9969cc4002bfc343ecfe0b8b5d4 100644 (file)
--- a/lib/log/log.h
+++ b/lib/log/log.h
@@ -43,6 +43,8 @@
 #include <string.h>            /* strerror() */
 #include <errno.h>
 
+#define EUNCLASSIFIED -1       /* Generic error code */
+
 #define _LOG_STDERR 128 /* force things to go to stderr, even if loglevel
                           would make them go to stdout */
 #define _LOG_DEBUG 7
@@ -56,8 +58,8 @@
 #define log_info(x...) LOG_LINE(_LOG_INFO, x)
 #define log_notice(x...) LOG_LINE(_LOG_NOTICE, x)
 #define log_warn(x...) LOG_LINE(_LOG_WARN | _LOG_STDERR, x)
-#define log_err(x...) LOG_LINE(_LOG_ERR, x)
-#define log_fatal(x...) LOG_LINE(_LOG_FATAL, x)
+#define log_err(x...) LOG_LINE_WITH_ERRNO(_LOG_ERR, EUNCLASSIFIED, x)
+#define log_fatal(x...) LOG_LINE_WITH_ERRNO(_LOG_FATAL, EUNCLASSIFIED, x)
 
 #define stack log_debug("<backtrace>") /* Backtrace on error */
 #define log_very_verbose(args...) log_info(args)