repo: Pass the package as well as the archive

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

diff --git a/src/pakfire/build.c b/src/pakfire/build.c
index a20f92386668c5403c26c3bac478586847b55045..46146e5b7dcdbe1670513b51bcbf2c8c655e6dea 100644 (file)
--- a/src/pakfire/build.c
+++ b/src/pakfire/build.c
@@ -2451,7 +2451,7 @@ ERROR:
 }
 
 static int pakfire_build_lint_archive(
-               struct pakfire_ctx* ctx, struct pakfire_archive* archive, void* data) {
+               struct pakfire_ctx* ctx, struct pakfire_package* pkg, struct pakfire_archive* archive, void* data) {
        return pakfire_archive_lint(archive, NULL, NULL);
 }
 

diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c
index bd36e4d834ae72cd64bc1451d6ff1cf2fd1ce094..068e02d3f844380ddbcf6b14c7e29366e13a20ff 100644 (file)
--- a/src/pakfire/repo.c
+++ b/src/pakfire/repo.c
@@ -2161,9 +2161,6 @@ ERROR:
        return r;
 }
 
-typedef int (*pakfire_repo_walk_archives_callback)
-       (struct pakfire_ctx* ctx, struct pakfire_archive* archive, void* data);
-
 struct pakfire_repo_walk_archives_state {
        pakfire_repo_walk_archives_callback callback;
        void* data;
@@ -2185,7 +2182,7 @@ static int __pakfire_repo_walk_archives(
                return -errno;
 
        // Call the callback
-       r = state->callback(ctx, archive, state->data);
+       r = state->callback(ctx, pkg, archive, state->data);
 
        // Cleanup
        pakfire_archive_unref(archive);
@@ -2194,7 +2191,7 @@ static int __pakfire_repo_walk_archives(
 }
 
 int pakfire_repo_walk_archives(struct pakfire_repo* self,
-               int (*callback)(struct pakfire_ctx* ctx, struct pakfire_archive* archive, void* data), void* data, int flags) {
+               pakfire_repo_walk_archives_callback callback, void* data, int flags) {
        struct pakfire_packagelist* list = NULL;
        int r;
 

diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h
index bbaa2b7435e4b26bf407fb43fc09165e903fde17..18aef93c25f568816826d865fef0b5516be292e5 100644 (file)
--- a/src/pakfire/repo.h
+++ b/src/pakfire/repo.h
@@ -137,7 +137,11 @@ struct pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo
 
 int pakfire_repo_walk_packages(struct pakfire_repo* self,
        int (*callback)(struct pakfire_ctx* ctx, struct pakfire_package* pkg, void* data), void* data, int flags);
+
+typedef int (*pakfire_repo_walk_archives_callback)
+       (struct pakfire_ctx* ctx, struct pakfire_package* pkg, struct pakfire_archive* archive, void* data);
+
 int pakfire_repo_walk_archives(struct pakfire_repo* self,
-       int (*callback)(struct pakfire_ctx* ctx, struct pakfire_archive* archive, void* data), void* data, int flags);
+       pakfire_repo_walk_archives_callback callback, void* data, int flags);
 
 #endif /* PAKFIRE_REPO_H */