util: Remove pakfire argument from pakfire_file_write

This is not needed any more.

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

diff --git a/src/pakfire/jail.c b/src/pakfire/jail.c
index 8ad019ba386375672c0efacd7cd29b99cfcbdab8..fcf402f3be550e1920461520e9bf22103b1c644f 100644 (file)
--- a/src/pakfire/jail.c
+++ b/src/pakfire/jail.c
@@ -1028,10 +1028,10 @@ static int pakfire_jail_setup_uid_mapping(struct pakfire_jail* jail, pid_t pid)
 
        // Running as root
        if (uid == 0) {
-               r = pakfire_file_write(jail->pakfire, path, 0, 0, 0,
+               r = pakfire_file_write(path, 0, 0, 0,
                        "0 %u %zu\n", subuid->id, subuid->length);
        } else {
-               r = pakfire_file_write(jail->pakfire, path, 0, 0, 0,
+               r = pakfire_file_write(path, 0, 0, 0,
                        "0 %u 1\n1 %u %zu\n", uid, subuid->id, subuid->length);
        }
 
@@ -1062,10 +1062,10 @@ static int pakfire_jail_setup_gid_mapping(struct pakfire_jail* jail, pid_t pid)
 
        // Running as root
        if (gid == 0) {
-               r = pakfire_file_write(jail->pakfire, path, 0, 0, 0,
+               r = pakfire_file_write(path, 0, 0, 0,
                        "0 %u %zu\n", subgid->id, subgid->length);
        } else {
-               r = pakfire_file_write(jail->pakfire, path, 0, 0, 0,
+               r = pakfire_file_write(path, 0, 0, 0,
                        "0 %u 1\n1 %u %zu\n", gid, subgid->id, subgid->length);
        }
 
@@ -1086,7 +1086,7 @@ static int pakfire_jail_setgroups(struct pakfire_jail* jail, pid_t pid) {
        if (r)
                return r;
 
-       r = pakfire_file_write(jail->pakfire, path, 0, 0, 0, "deny\n");
+       r = pakfire_file_write(path, 0, 0, 0, "deny\n");
        if (r) {
                ERROR(jail->ctx, "Could not set setgroups to deny: %s\n", strerror(errno));
                r = -errno;

diff --git a/src/pakfire/util.c b/src/pakfire/util.c
index bf2e856bde8983fc9e4487410f0138e0fbf62ed6..db66f6982d1bab2feff5b25dd67a853f588f4c02 100644 (file)
--- a/src/pakfire/util.c
+++ b/src/pakfire/util.c
@@ -51,7 +51,7 @@ const char* pakfire_path_relpath(const char* root, const char* path) {
        return NULL;
 }
 
-int pakfire_file_write(struct pakfire* pakfire, const char* path,
+int pakfire_file_write(const char* path,
                uid_t owner, gid_t group, mode_t mode, const char* format, ...) {
        va_list args;
        int r = 1;

diff --git a/src/pakfire/util.h b/src/pakfire/util.h
index 01c44a1f56e43ce1a3161ba0344548e7c2f85fbf..79ca2dbab4757443f2b02eff2bca6b6ad9215813 100644 (file)
--- a/src/pakfire/util.h
+++ b/src/pakfire/util.h
@@ -56,9 +56,8 @@ static inline int pakfire_rewind(FILE* f) {
        return fseek(f, 0, SEEK_SET);
 }
 
-int pakfire_file_write(struct pakfire* pakfire, const char* path,
-       uid_t owner, gid_t group, mode_t mode, const char* format, ...)
-       __attribute__((format(printf, 6, 7)));
+int pakfire_file_write(const char* path, uid_t owner, gid_t group, mode_t mode,
+       const char* format, ...) __attribute__((format(printf, 5, 6)));
 
 int pakfire_touch(const char* path, mode_t mode);
 int pakfire_mkparentdir(const char* path, mode_t mode);