pakfire: Pass log data pointer to log functions

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 58a5bb05b7bd92e8cd45c7198f72026a3cf27ebe..4a156c97074910e9c5cd3a140fb5d0c2b4ab1e13 100644 (file)
--- a/src/libpakfire/include/pakfire/logging.h
+++ b/src/libpakfire/include/pakfire/logging.h
@@ -26,9 +26,9 @@
 #include <pakfire/pakfire.h>
 #include <pakfire/types.h>
 
-void pakfire_log_stderr(int priority, const char* file,
+void pakfire_log_stderr(void* data, int priority, const char* file,
        int line, const char* fn, const char* format, va_list args);
-void pakfire_log_syslog(int priority, const char* file,
+void pakfire_log_syslog(void* data, int priority, const char* file,
        int line, const char* fn, const char* format, va_list args);
 
 #ifdef PAKFIRE_PRIVATE

diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h
index 039c3825bb000f6dbd03c5afda3b0b22bfda1328..d07f11c0da4cf39e943edcb659113fb678b3db26 100644 (file)
--- a/src/libpakfire/include/pakfire/types.h
+++ b/src/libpakfire/include/pakfire/types.h
@@ -35,9 +35,8 @@ typedef struct _PakfireProblem* PakfireProblem;
 typedef struct _PakfireRepo* PakfireRepo;
 typedef struct _PakfireSolution* PakfireSolution;
 
-typedef void (*pakfire_log_function_t)(int priority,
-               const char* file, int line, const char* fn,
-               const char* format, va_list args);
+typedef void (*pakfire_log_function_t)(void* data, int priority, const char* file,
+               int line, const char* fn, const char* format, va_list args);
 
 enum _pakfire_comparison_types {
        PAKFIRE_ICASE     = 1 << 0,

diff --git a/src/libpakfire/logging.c b/src/libpakfire/logging.c
index 8743faaaeb564f6ec059b745eaff62ae398331d8..cbc559db5593ce82b47e6debc1b61d509f7b7cb7 100644 (file)
--- a/src/libpakfire/logging.c
+++ b/src/libpakfire/logging.c
@@ -24,7 +24,7 @@
 
 #include <pakfire/private.h>
 
-PAKFIRE_EXPORT void pakfire_log_stderr(int priority, const char* file,
+PAKFIRE_EXPORT void pakfire_log_stderr(void* data, int priority, const char* file,
                int line, const char* fn, const char* format, va_list args) {
        fprintf(stderr, "pakfire: ");
 
@@ -35,7 +35,7 @@ PAKFIRE_EXPORT void pakfire_log_stderr(int priority, const char* file,
        vfprintf(stderr, format, args);
 }
 
-PAKFIRE_EXPORT void pakfire_log_syslog(int priority, const char* file,
+PAKFIRE_EXPORT void pakfire_log_syslog(void* data, int priority, const char* file,
                int line, const char* fn, const char* format, va_list args) {
        openlog("pakfire", LOG_PID, LOG_DAEMON);
        vsyslog(priority | LOG_DAEMON, format, args);

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 477d85d76a786237956f7e4774d01170d6eea4d6..82cdac8559bb2dfed0d6c85c597281641b7a7d9a 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -1426,7 +1426,7 @@ PAKFIRE_EXPORT void pakfire_log(Pakfire pakfire, int priority, const char* file,
        int saved_errno = errno;
 
        va_start(args, format);
-       pakfire->log_function(priority, file, line, fn, format, args);
+       pakfire->log_function(pakfire->log_data, priority, file, line, fn, format, args);
        va_end(args);
 
        // Restore errno