From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 19 Dec 2023 17:22:11 +0000 (+0000)
Subject: jail: Drop custom log callback stuff
X-Git-Tag: 0.9.30~1266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fde75844b096261cb124dd55b20c86738b5acf8;p=pakfire.git

jail: Drop custom log callback stuff

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

diff --git a/src/libpakfire/include/pakfire/jail.h b/src/libpakfire/include/pakfire/jail.h
index d5d2feb2a..6185d2016 100644
--- a/src/libpakfire/include/pakfire/jail.h
+++ b/src/libpakfire/include/pakfire/jail.h
@@ -25,9 +25,6 @@
 
 struct pakfire_jail;
 
-typedef int (*pakfire_jail_log_callback)
-	(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length);
-
 int pakfire_jail_create(struct pakfire_jail** jail, struct pakfire* pakfire);
 
 struct pakfire_jail* pakfire_jail_ref(struct pakfire_jail* jail);
@@ -37,10 +34,6 @@ struct pakfire_jail* pakfire_jail_unref(struct pakfire_jail* jail);
 int pakfire_jail_bind(struct pakfire_jail* jail,
 	const char* source, const char* target, int flags);
 
-// Callbacks
-void pakfire_jail_set_log_callback(struct pakfire_jail* jail,
-	pakfire_jail_log_callback callback, void* data);
-
 // Resource Limits
 int pakfire_jail_nice(struct pakfire_jail* jail, int nice);
 
diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index 9aac4962b..98ab12d5d 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -112,13 +112,6 @@ struct pakfire_jail {
 	// Mountpoints
 	struct pakfire_jail_mountpoint mountpoints[MAX_MOUNTPOINTS];
 	unsigned int num_mountpoints;
-
-	// Callbacks
-	struct pakfire_jail_callbacks {
-		// Log
-		pakfire_jail_log_callback log;
-		void* log_data;
-	} callbacks;
 };
 
 struct pakfire_log_buffer {
@@ -308,9 +301,6 @@ PAKFIRE_EXPORT int pakfire_jail_create(struct pakfire_jail** jail, struct pakfir
 
 	DEBUG(j->pakfire, "Allocated new jail at %p\n", j);
 
-	// Set the default logging callback
-	pakfire_jail_set_log_callback(j, pakfire_jail_default_log_callback, NULL);
-
 	// Set default environment
 	for (const struct environ* e = ENV; e->key; e++) {
 		r = pakfire_jail_set_env(j, e->key, e->val);
@@ -361,14 +351,6 @@ PAKFIRE_EXPORT struct pakfire_jail* pakfire_jail_unref(struct pakfire_jail* jail
 	return NULL;
 }
 
-// Logging Callback
-
-PAKFIRE_EXPORT void pakfire_jail_set_log_callback(struct pakfire_jail* jail,
-		pakfire_jail_log_callback callback, void* data) {
-	jail->callbacks.log = callback;
-	jail->callbacks.log_data = data;
-}
-
 // Resource Limits
 
 PAKFIRE_EXPORT int pakfire_jail_nice(struct pakfire_jail* jail, int nice) {
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 73fb3968d..6083a70e6 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -181,7 +181,6 @@ global:
 	pakfire_jail_nice;
 	pakfire_jail_ref;
 	pakfire_jail_set_env;
-	pakfire_jail_set_log_callback;
 	pakfire_jail_set_timeout;
 	pakfire_jail_unref;