logging: Drop syslog-compatibility option

It is no longer possible to build Pakfire without systemd and so we
don't need to carry around code that cannot be used.

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

diff --git a/configure.ac b/configure.ac
index 40a2cdeb56d24a37d6980caba3a31c4f5bc8b2a4..d172344d090409224117d3d155755e36168544c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,6 @@ AC_CHECK_FUNCS([ \
        getpid \
        glob \
        nftw \
-       openlog \
        personality \
        prctl \
        remove \
@@ -254,7 +253,6 @@ AC_CHECK_FUNCS([ \
        snprintf \
        strcmp \
        strdup \
-       syslog \
        qsort \
        uname \
        unlink \
@@ -285,8 +283,7 @@ PKG_CHECK_MODULES([PCRE2], [libpcre2-8])
 PKG_CHECK_MODULES([SECCOMP], [libseccomp])
 PKG_CHECK_MODULES([SOLV], [libsolv >= 0.7.5])
 PKG_CHECK_MODULES([SQLITE3], [sqlite3])
-PKG_CHECK_MODULES([SYSTEMD], [libsystemd],
-       [AC_DEFINE([HAVE_SYSTEMD], [1], [Use systemd])])
+PKG_CHECK_MODULES([SYSTEMD], [libsystemd])
 PKG_CHECK_MODULES([UUID], [uuid])
 PKG_CHECK_MODULES([ZSTD], [libzstd])
 

diff --git a/src/libpakfire/logging.c b/src/libpakfire/logging.c
index 5236bce264a79daec23e8911235403eace88fc9c..f6bb7856debbb517ac9a0e3f8073830ed0585150 100644 (file)
--- a/src/libpakfire/logging.c
+++ b/src/libpakfire/logging.c
@@ -23,15 +23,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <systemd/sd-journal.h>
+
 #include <pakfire/logging.h>
 #include <pakfire/private.h>
 
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-journal.h>
-#else
-#include <syslog.h>
-#endif
-
 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: ");
@@ -43,8 +39,6 @@ PAKFIRE_EXPORT void pakfire_log_stderr(void* data, int priority, const char* fil
        vfprintf(stderr, format, args);
 }
 
-#ifdef HAVE_SYSTEMD
-
 PAKFIRE_EXPORT void pakfire_log_syslog(void* data, int priority, const char* file,
                int line, const char* fn, const char* format, va_list args) {
        char* buffer = NULL;
@@ -80,13 +74,3 @@ PAKFIRE_EXPORT void pakfire_log_syslog(void* data, int priority, const char* fil
        if (buffer)
                free(buffer);
 }
-
-#else /* HAVE_SYSTEMD */
-
-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);
-}
-
-#endif /* HAVE_SYSTEMD */