log: change severities to be identical to kernel sevs

The kernel defines 8 severities. Lets be compatible to these numbers so
our API will not have to be changes in the future.

This also causes LOG_ALERT to be added. It is not used, yet, but may be in
the future.

We also change the parameter type of severities to "unsigned int". Enum
variables can change types if new enums are added. We don't want that so
use a fixed type.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

diff --git a/src/log.c b/src/log.c
index 1af00f1..402ccec 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -95,6 +95,7 @@ const struct log_config LOG_CONFIG = {
                [LOG_WARNING] = 2,
                [LOG_ERROR] = 2,
                [LOG_CRITICAL] = 2,
+               [LOG_ALERT] = 2,
                [LOG_FATAL] = 2,
        }
 };
@@ -134,6 +135,7 @@ static struct log_config log__gconfig = {
                [LOG_WARNING] = 1,
                [LOG_ERROR] = 1,
                [LOG_CRITICAL] = 1,
+               [LOG_ALERT] = 1,
                [LOG_FATAL] = 1,
        }
 };
@@ -295,7 +297,7 @@ static void log__submit(const char *file,
                        const char *func,
                        const struct log_config *config,
                        const char *subs,
-                       enum log_severity sev,
+                       unsigned int sev,
                        const char *format,
                        va_list args);
 
@@ -304,7 +306,7 @@ static void log__format(const char *file,
                        const char *func,
                        const struct log_config *config,
                        const char *subs,
-                       enum log_severity sev,
+                       unsigned int sev,
                        const char *format,
                        ...);
 
@@ -379,6 +381,7 @@ static const char *log__sev2str[] = {
        "WARNING",              /* LOG_WARNING */
        "ERROR",                /* LOG_ERROR */
        "CRITICAL",             /* LOG_CRITICAL */
+       "ALERT",                /* LOG_ALERT */
        "FATAL",                /* LOG_FATAL */
 };
 
@@ -387,7 +390,7 @@ static void log__submit(const char *file,
                        const char *func,
                        const struct log_config *config,
                        const char *subs,
-                       enum log_severity sev,
+                       unsigned int sev,
                        const char *format,
                        va_list args)
 {
@@ -442,7 +445,7 @@ static void log__format(const char *file,
                        const char *func,
                        const struct log_config *config,
                        const char *subs,
-                       enum log_severity sev,
+                       unsigned int sev,
                        const char *format,
                        ...)
 {
@@ -458,7 +461,7 @@ void log_submit(const char *file,
                const char *func,
                const struct log_config *config,
                const char *subs,
-               enum log_severity sev,
+               unsigned int sev,
                const char *format,
                va_list args)
 {
@@ -476,7 +479,7 @@ void log_format(const char *file,
                const char *func,
                const struct log_config *config,
                const char *subs,
-               enum log_severity sev,
+               unsigned int sev,
                const char *format,
                ...)
 {

diff --git a/src/log.h b/src/log.h
index 5f0c16a..aa3e0f6 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -95,13 +95,14 @@
  */
 
 enum log_severity {
-       LOG_DEBUG,
-       LOG_INFO,
-       LOG_NOTICE,
-       LOG_WARNING,
-       LOG_ERROR,
-       LOG_CRITICAL,
-       LOG_FATAL,
+       LOG_FATAL = 0,
+       LOG_ALERT = 1,
+       LOG_CRITICAL = 2,
+       LOG_ERROR = 3,
+       LOG_WARNING = 4,
+       LOG_NOTICE = 5,
+       LOG_INFO = 6,
+       LOG_DEBUG = 7,
        LOG_SEV_NUM,
 };
 
@@ -118,7 +119,7 @@ struct log_config {
        int sev[LOG_SEV_NUM];
 };
 
-#define LOG_CONFIG_ALL(debug, info, notice, warning, error, critical, fatal) \
+#define LOG_CONFIG_ALL(debug, info, notice, warning, error, critical, alert, fatal) \
        (struct log_config){ .sev = { \
                [LOG_DEBUG] = (debug), \
                [LOG_INFO] = (info), \
@@ -126,15 +127,16 @@ struct log_config {
                [LOG_WARNING] = (warning), \
                [LOG_ERROR] = (error), \
                [LOG_CRITICAL] = (critical), \
+               [LOG_ALERT] = (alert), \
                [LOG_FATAL] = (fatal), \
        } }
 
 #define LOG_CONFIG_DEBUG(debug) \
-       LOG_CONFIG_ALL((debug), 2, 2, 2, 2, 2, 2)
+       LOG_CONFIG_ALL((debug), 2, 2, 2, 2, 2, 2, 2)
 #define LOG_CONFIG_INFO(debug, info) \
-       LOG_CONFIG_ALL((debug), (info), 2, 2, 2, 2, 2)
+       LOG_CONFIG_ALL((debug), (info), 2, 2, 2, 2, 2, 2)
 #define LOG_CONFIG_WARNING(debug, info, notice, warning) \
-       LOG_CONFIG_ALL((debug), (info), (notice), (warning), 2, 2, 2)
+       LOG_CONFIG_ALL((debug), (info), (notice), (warning), 2, 2, 2, 2)
 
 void log_set_config(const struct log_config *config);
 int log_add_filter(const struct log_filter *filter,
@@ -175,7 +177,7 @@ void log_submit(const char *file,
                const char *func,
                const struct log_config *config,
                const char *subs,
-               enum log_severity sev,
+               unsigned int sev,
                const char *format,
                va_list args);
 
@@ -184,7 +186,7 @@ void log_format(const char *file,
                const char *func,
                const struct log_config *config,
                const char *subs,
-               enum log_severity sev,
+               unsigned int sev,
                const char *format,
                ...);
 
@@ -261,6 +263,8 @@ extern const char *LOG_SUBSYSTEM;
        log_printf(LOG_ERROR, (format), ##__VA_ARGS__)
 #define log_critical(format, ...) \
        log_printf(LOG_CRITICAL, (format), ##__VA_ARGS__)
+#define log_alert(format, ...) \
+       log_printf(LOG_ALERT, (format), ##__VA_ARGS__)
 #define log_fatal(format, ...) \
        log_printf(LOG_FATAL, (format), ##__VA_ARGS__)