From: Michael Tremer Date: Tue, 28 Jan 2025 14:00:35 +0000 (+0000) Subject: repo: Pass the package as well as the archive X-Git-Tag: 0.9.30~322 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66514991f7853998de9180e0a85137783e68c514;p=pakfire.git repo: Pass the package as well as the archive Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/build.c b/src/pakfire/build.c index a20f9238..46146e5b 100644 --- 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 bd36e4d8..068e02d3 100644 --- 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 bbaa2b74..18aef93c 100644 --- 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 */