From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Oct 2023 10:34:22 +0000 (+0000)
Subject: logging: Fix context logging arguments
X-Git-Tag: 0.9.30~1493
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05804c862db5f0043f9986412bbbb297a9ba1cbb;p=pakfire.git

logging: Fix context logging arguments

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/include/pakfire/logging.h b/src/libpakfire/include/pakfire/logging.h
index 69fda7f77..508ed5981 100644
--- a/src/libpakfire/include/pakfire/logging.h
+++ b/src/libpakfire/include/pakfire/logging.h
@@ -38,21 +38,21 @@ void pakfire_log_syslog(void* data, int priority, const char* file,
 #include <pakfire/ctx.h>
 #include <pakfire/pakfire.h>
 
-#define pakfire_ctx_log_condition(ctx, level, r, arg...) \
+#define pakfire_ctx_log_condition(ctx, level, arg...) \
 	do { \
-		if (pakfire_ctx_get_log_level(pakfire) >= level) \
-			pakfire_ctx_log(ctx, level, r, __FILE__, __LINE__, __FUNCTION__, ## arg); \
+		if (pakfire_ctx_get_log_level(ctx) >= level) \
+			pakfire_ctx_log(ctx, level, __FILE__, __LINE__, __FUNCTION__, ## arg); \
 	} while (0)
 
 // This function does absolutely nothing
 static inline void __attribute__((always_inline, format(printf, 2, 3)))
 	pakfire_ctx_log_null(struct pakfire_ctx* ctx, const char *format, ...) {}
 
-#define CTX_INFO(ctx, arg...) pakfire_ctx_log_condition(ctx, LOG_INFO, 0, ## arg)
-#define CTX_ERROR(ctx, arg...) pakfire_ctx_log_condition(ctx, LOG_ERR, 0, ## arg)
+#define CTX_INFO(ctx, arg...) pakfire_ctx_log_condition(ctx, LOG_INFO, ## arg)
+#define CTX_ERROR(ctx, arg...) pakfire_ctx_log_condition(ctx, LOG_ERR, ## arg)
 
 #ifdef ENABLE_DEBUG
-#	define CTX_DEBUG(ctx, arg...) pakfire_ctx_log_condition(ctx, LOG_DEBUG, 0, ## arg)
+#	define CTX_DEBUG(ctx, arg...) pakfire_ctx_log_condition(ctx, LOG_DEBUG, ## arg)
 #else
 #	define CTX_DEBUG pakfire_ctx_log_null
 #endif