From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 Dec 2022 18:37:51 +0000 (+0000)
Subject: jail: Drop superfluous arguments that are never used from convenience function
X-Git-Tag: 0.9.28~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49a9babcc405fe8c4035d4c0e9b5a07b84f1e3ba;p=pakfire.git

jail: Drop superfluous arguments that are never used from convenience function

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 dc1396cb6..a05774dbc 100644
--- a/src/libpakfire/include/pakfire/jail.h
+++ b/src/libpakfire/include/pakfire/jail.h
@@ -81,10 +81,7 @@ int pakfire_jail_set_cgroup(struct pakfire_jail* jail, struct pakfire_cgroup* cg
 // Convenience functions
 int pakfire_jail_run(struct pakfire* pakfire, const char* argv[], int flags, char** output);
 int pakfire_jail_run_script(struct pakfire* pakfire,
-	const char* script, const size_t length, const char* argv[], int flags,
-	pakfire_jail_communicate_in communicate_in,
-	pakfire_jail_communicate_out communicate_out,
-	void* data);
+	const char* script, const size_t length, const char* argv[], int flags);
 
 int pakfire_jail_shell(struct pakfire_jail* jail);
 int pakfire_jail_ldconfig(struct pakfire* pakfire);
diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index 54b8a0807..d0a281f95 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -1672,10 +1672,7 @@ ERROR:
 }
 
 int pakfire_jail_run_script(struct pakfire* pakfire,
-		const char* script, const size_t length, const char* argv[], int flags,
-		pakfire_jail_communicate_in communicate_in,
-		pakfire_jail_communicate_out communicate_out,
-		void* data) {
+		const char* script, const size_t length, const char* argv[], int flags) {
 	struct pakfire_jail* jail = NULL;
 	int r;
 
@@ -1685,8 +1682,7 @@ int pakfire_jail_run_script(struct pakfire* pakfire,
 		goto ERROR;
 
 	// Execute the command
-	r = pakfire_jail_exec_script(jail, script, length, argv,
-		communicate_in, communicate_out, data);
+	r = pakfire_jail_exec_script(jail, script, length, argv, NULL, NULL, NULL);
 
 ERROR:
 	if (jail)
diff --git a/src/libpakfire/scriptlet.c b/src/libpakfire/scriptlet.c
index 919c4ba54..e75dd6e55 100644
--- a/src/libpakfire/scriptlet.c
+++ b/src/libpakfire/scriptlet.c
@@ -170,7 +170,7 @@ int pakfire_scriptlet_execute(struct pakfire_scriptlet* scriptlet) {
 	// Detect what kind of script this is and run it
 	if (pakfire_scriptlet_is_shell_script(scriptlet))
 		return pakfire_jail_run_script(scriptlet->pakfire,
-			scriptlet->data, scriptlet->size, NULL, 0, NULL, NULL, NULL);
+			scriptlet->data, scriptlet->size, NULL, 0);
 
 	ERROR(scriptlet->pakfire, "Scriptlet is of an unknown kind\n");
 	errno = ENOTSUP;