log: keep log level logic in one place

Do not distribute the filtering over several places.

While at it also make it the arguments a bit more readable.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/src/nvme/log.c b/src/nvme/log.c
index c98d2135fb98ea4fe25a7969c923f952b58d3d53..d3f84104225a2d0c0035833646fa4862f36660eb 100644 (file)
--- a/src/nvme/log.c
+++ b/src/nvme/log.c
@@ -29,7 +29,7 @@
 static nvme_root_t root;
 
 void __attribute__((format(printf, 4, 5)))
-__nvme_msg(nvme_root_t r, int lvl,
+__nvme_msg(nvme_root_t r, int level,
           const char *func, const char *format, ...)
 {
        FILE *fp = stderr;
@@ -56,9 +56,9 @@ __nvme_msg(nvme_root_t r, int lvl,
        if (r)
                fp = r->fp;
 
-       if (r && lvl > r->log_level)
+       if (r && level > r->log_level)
                return;
-       if (!r && lvl > DEFAULT_LOGLEVEL)
+       if (!r && level > DEFAULT_LOGLEVEL)
                return;
 
        if (r && r->log_timestamp) {

diff --git a/src/nvme/private.h b/src/nvme/private.h
index dec3d8509bc9344dd220bffca7a4f201f40376fb..18363502f9039b2ce44241a08366bfb0536e1f05 100644 (file)
--- a/src/nvme/private.h
+++ b/src/nvme/private.h
@@ -198,14 +198,10 @@ void *__nvme_realloc(void *p, size_t len);
 #endif
 
 void __attribute__((format(printf, 4, 5)))
-__nvme_msg(nvme_root_t r, int lvl, const char *func, const char *format, ...);
-
-#define nvme_msg(r, lvl, format, ...)                                  \
-       do {                                                            \
-               if ((lvl) <= MAX_LOGLEVEL)                              \
-                       __nvme_msg(r, lvl, __nvme_log_func,             \
-                                  format, ##__VA_ARGS__);              \
-       } while (0)
+__nvme_msg(nvme_root_t r, int level, const char *func, const char *format, ...);
+
+#define nvme_msg(r, level, format, ...)                                        \
+       __nvme_msg(r, level, __nvme_log_func, format, ##__VA_ARGS__)
 
 #define root_from_ctrl(c) ((c)->s && (c)->s->h ? (c)->s->h->r : NULL)
 #define root_from_ns(n) ((n)->s && (n)->s->h ? (n)->s->h->r : \