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 dc1396cb63d141fd8b1d79e58d1a592681737ed3..a05774dbc44687de656908794689bed029891e1c 100644 (file)
--- 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 54b8a0807bfcffaabc239156f3ae262cf62a6ecb..d0a281f95d3ec89a406b3a3e1920feaa81f35229 100644 (file)
--- 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 919c4ba54279a8b43bfc0ddf960954b01ffc67e0..e75dd6e555407e7614abffab5bf994d3a6105e89 100644 (file)
--- 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;