From 8c1fae7cc31ead00dec3421343e108b5fbc85d1a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 29 Jun 2025 13:22:52 +0000 Subject: [PATCH] filelist: Directly pass the context Signed-off-by: Michael Tremer --- src/pakfire/archive.c | 2 +- src/pakfire/archive_writer.c | 2 +- src/pakfire/build.c | 10 +++++----- src/pakfire/db.c | 4 ++-- src/pakfire/dist.c | 2 +- src/pakfire/filelist.c | 4 ++-- src/pakfire/filelist.h | 2 +- src/pakfire/linter.c | 2 +- src/pakfire/package.c | 2 +- src/pakfire/packager.c | 2 +- src/pakfire/stripper.c | 6 +++--- tests/libpakfire/file.c | 2 +- tests/libpakfire/package.c | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c index 631ffeab..f328a685 100644 --- a/src/pakfire/archive.c +++ b/src/pakfire/archive.c @@ -1467,7 +1467,7 @@ static int pakfire_archive_load_filelist(pakfire_archive* self) { int r; // Create a new filelist - r = pakfire_filelist_create(&filelist, self->root); + r = pakfire_filelist_create(&filelist, self->ctx, self->root); if (r < 0) goto ERROR; diff --git a/src/pakfire/archive_writer.c b/src/pakfire/archive_writer.c index 34f0b394..17f09e70 100644 --- a/src/pakfire/archive_writer.c +++ b/src/pakfire/archive_writer.c @@ -557,7 +557,7 @@ int pakfire_archive_writer_write_everything( int r; // Create a new filelist - r = pakfire_filelist_create(&files, self->root); + r = pakfire_filelist_create(&files, self->ctx, self->root); if (r < 0) goto ERROR; diff --git a/src/pakfire/build.c b/src/pakfire/build.c index 474c7740..dd9bc246 100644 --- a/src/pakfire/build.c +++ b/src/pakfire/build.c @@ -809,7 +809,7 @@ static int pakfire_build_find_perl_deps(pakfire_build* build, return 0; // Create a new filelist - r = pakfire_filelist_create(&perlfiles, build->root); + r = pakfire_filelist_create(&perlfiles, build->ctx, build->root); if (r < 0) goto ERROR; @@ -970,7 +970,7 @@ static int pakfire_build_package_add_files(pakfire_build* build, goto ERROR; // Allocate a new filelist - r = pakfire_filelist_create(&filelist, build->root); + r = pakfire_filelist_create(&filelist, build->ctx, build->root); if (r) goto ERROR; @@ -1457,7 +1457,7 @@ static int pakfire_build_post_process_files(pakfire_build* build, int r; // Create a filelist with objects that need to be removed - r = pakfire_filelist_create(&removees, build->root); + r = pakfire_filelist_create(&removees, build->ctx, build->root); if (r) goto ERROR; @@ -1650,7 +1650,7 @@ static int pakfire_build_run_post_build_checks(pakfire_build* build) { int r; // Create a filelist of all files in the build - r = pakfire_filelist_create(&filelist, build->root); + r = pakfire_filelist_create(&filelist, build->ctx, build->root); if (r) { ERROR(build->ctx, "Could not create filelist: %m\n"); goto ERROR; @@ -2306,7 +2306,7 @@ static int pakfire_build_check_unpackaged_files(pakfire_build* build) { int r; // Create a new filelist - r = pakfire_filelist_create(&filelist, build->root); + r = pakfire_filelist_create(&filelist, build->ctx, build->root); if (r) goto ERROR; diff --git a/src/pakfire/db.c b/src/pakfire/db.c index f617b38b..35a777ea 100644 --- a/src/pakfire/db.c +++ b/src/pakfire/db.c @@ -2372,7 +2372,7 @@ int pakfire_db_filelist(pakfire_db* db, pakfire_filelist** filelist) { } // Create a new filelist - r = pakfire_filelist_create(&list, db->root); + r = pakfire_filelist_create(&list, db->ctx, db->root); if (r) goto ERROR; @@ -2434,7 +2434,7 @@ int pakfire_db_package_filelist(pakfire_db* db, pakfire_filelist** filelist, } // Create a new filelist - r = pakfire_filelist_create(&fl, db->root); + r = pakfire_filelist_create(&fl, db->ctx, db->root); if (r) { ERROR(db->ctx, "Could not create filelist: %m\n"); goto ERROR; diff --git a/src/pakfire/dist.c b/src/pakfire/dist.c index 415fc835..a523fa83 100644 --- a/src/pakfire/dist.c +++ b/src/pakfire/dist.c @@ -419,7 +419,7 @@ static int pakfire_dist_add_files(pakfire_ctx* ctx, pakfire_root* root, DEBUG(ctx, "Adding all files in '%s' to package...\n", path); // Create a new filelist - r = pakfire_filelist_create(&filelist, root); + r = pakfire_filelist_create(&filelist, ctx, root); if (r) goto ERROR; diff --git a/src/pakfire/filelist.c b/src/pakfire/filelist.c index 4c0040f6..9ed37541 100644 --- a/src/pakfire/filelist.c +++ b/src/pakfire/filelist.c @@ -44,7 +44,7 @@ struct pakfire_filelist { unsigned int num_files; }; -int pakfire_filelist_create(pakfire_filelist** list, pakfire_root* root) { +int pakfire_filelist_create(pakfire_filelist** list, pakfire_ctx* ctx, pakfire_root* root) { pakfire_filelist* l = NULL; // Allocate a new object @@ -53,7 +53,7 @@ int pakfire_filelist_create(pakfire_filelist** list, pakfire_root* root) { return -errno; // Store a reference to the context - l->ctx = pakfire_root_get_ctx(root); + l->ctx = pakfire_ctx_ref(ctx); // Store a reference to the root l->root = pakfire_root_ref(root); diff --git a/src/pakfire/filelist.h b/src/pakfire/filelist.h index b4122fba..51560920 100644 --- a/src/pakfire/filelist.h +++ b/src/pakfire/filelist.h @@ -29,7 +29,7 @@ typedef struct pakfire_filelist pakfire_filelist; #include #include -int pakfire_filelist_create(pakfire_filelist** list, pakfire_root* root); +int pakfire_filelist_create(pakfire_filelist** list, pakfire_ctx* ctx, pakfire_root* root); pakfire_filelist* pakfire_filelist_ref(pakfire_filelist* list); pakfire_filelist* pakfire_filelist_unref(pakfire_filelist* list); diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c index 3088c596..fbd660d0 100644 --- a/src/pakfire/linter.c +++ b/src/pakfire/linter.c @@ -202,7 +202,7 @@ int pakfire_linter_create(pakfire_linter** linter, } // Create a filelist - r = pakfire_filelist_create(&l->filelist, l->root); + r = pakfire_filelist_create(&l->filelist, l->ctx, l->root); if (r < 0) goto ERROR; diff --git a/src/pakfire/package.c b/src/pakfire/package.c index 5f4248fa..225da9d7 100644 --- a/src/pakfire/package.c +++ b/src/pakfire/package.c @@ -2339,7 +2339,7 @@ pakfire_filelist* pakfire_package_get_filelist(pakfire_package* pkg) { pakfire_filelist* filelist = NULL; // Create a new filelist - int r = pakfire_filelist_create(&filelist, pkg->root); + int r = pakfire_filelist_create(&filelist, pkg->ctx, pkg->root); if (r) goto ERROR; diff --git a/src/pakfire/packager.c b/src/pakfire/packager.c index d6afd2fc..54722089 100644 --- a/src/pakfire/packager.c +++ b/src/pakfire/packager.c @@ -152,7 +152,7 @@ int pakfire_packager_create(pakfire_packager** packager, goto ERROR; // Create filelist - r = pakfire_filelist_create(&p->filelist, p->root); + r = pakfire_filelist_create(&p->filelist, p->ctx, p->root); if (r) goto ERROR; diff --git a/src/pakfire/stripper.c b/src/pakfire/stripper.c index cc89096b..b1b0c3e4 100644 --- a/src/pakfire/stripper.c +++ b/src/pakfire/stripper.c @@ -107,12 +107,12 @@ int pakfire_stripper_create(pakfire_stripper** stripper, goto ERROR; // Create a filelist - r = pakfire_filelist_create(&self->filelist, self->root); + r = pakfire_filelist_create(&self->filelist, self->ctx, self->root); if (r < 0) goto ERROR; // Create a list for the sources - r = pakfire_filelist_create(&self->sources, self->root); + r = pakfire_filelist_create(&self->sources, self->ctx, self->root); if (r < 0) goto ERROR; @@ -188,7 +188,7 @@ static int pakfire_stripper_scan(pakfire_stripper* self) { int r; // Create a new filelist - r = pakfire_filelist_create(&filelist, self->root); + r = pakfire_filelist_create(&filelist, self->ctx, self->root); if (r < 0) goto ERROR; diff --git a/tests/libpakfire/file.c b/tests/libpakfire/file.c index 4a0a8f98..4df380c6 100644 --- a/tests/libpakfire/file.c +++ b/tests/libpakfire/file.c @@ -68,7 +68,7 @@ static int test_create_filelist(const struct test* t) { int r = EXIT_FAILURE; // Create a new filelist - ASSERT_SUCCESS(pakfire_filelist_create(&list, t->root)); + ASSERT_SUCCESS(pakfire_filelist_create(&list, t->ctx, t->root)); // Create some files ASSERT_SUCCESS(pakfire_file_create(&file1, t->ctx, t->root, "/1")); diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c index 71a73412..3b022971 100644 --- a/tests/libpakfire/package.c +++ b/tests/libpakfire/package.c @@ -256,7 +256,7 @@ static int test_filelist(const struct test* t) { int r = EXIT_FAILURE; // Create a filelist - ASSERT_SUCCESS(pakfire_filelist_create(&filelist, t->root)); + ASSERT_SUCCESS(pakfire_filelist_create(&filelist, t->ctx, t->root)); // Create a file ASSERT_SUCCESS(pakfire_file_create(&file, t->ctx, t->root, "/bin/bash")); -- 2.47.2