filelist: Directly pass the context

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

diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c
index 631ffeab67b6b9ad8615d18707ee3af83cf5bf70..f328a685de2d514cc190b3b5211f0c03c456e58c 100644 (file)
--- 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 34f0b394f2e746cab687ea7a69bd72a35247e2b8..17f09e70805d02a05fd0f64ffedb438aa4bc999f 100644 (file)
--- 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 474c7740f3e95f323e6f07d0c6cf53232bb4a847..dd9bc246487a4d7728909b5d980428a559ab420c 100644 (file)
--- 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 f617b38b559b8a38269d57d5971c35786340cd18..35a777ea138d0a7e132ca54929bbbef8533b7d72 100644 (file)
--- 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 415fc83549932cbc1d8a3e7fb49f0dcf22b08224..a523fa83d84385e5a2daeb0dfc9169b63ec0be7e 100644 (file)
--- 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 4c0040f6a46ec3a49a494686f4d78b4b1fee284b..9ed37541d3e49aed89ffd7e286793dcfe626a3b5 100644 (file)
--- 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 b4122fba9fd1955504dcdb8c0328978dc78dd515..51560920e5741e094f6703afe1e738fd9e65cc0b 100644 (file)
--- a/src/pakfire/filelist.h
+++ b/src/pakfire/filelist.h
@@ -29,7 +29,7 @@ typedef struct pakfire_filelist pakfire_filelist;
 #include <pakfire/file.h>
 #include <pakfire/root.h>
 
-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 3088c596b727eab8eddae80d39cbf693945a6b92..fbd660d02518fda364f490439eac90656fc753cb 100644 (file)
--- 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 5f4248fa1ee3c4adabb5cb7a3ca47369649d8700..225da9d7e414d86f9d7ec2f4feb44dba9b136535 100644 (file)
--- 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 d6afd2fcc63a7a280de79d807263ca3ca268506f..5472208953eb3e376c87bf5df6678dd22eea3888 100644 (file)
--- 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 cc89096bc78a89da4c48e20f82faeaf9817ffbc4..b1b0c3e4208e310cc9a518486125512623b7b6a0 100644 (file)
--- 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 4a0a8f98ab056667cce31499af3dfa371c27d593..4df380c664dd14000fbdd3f71a1a3101b2473166 100644 (file)
--- 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 71a73412ea37bea9ac2dfcb5f8903ba95d07794c..3b022971b626fd712a20bb053a0e28431caf26ff 100644 (file)
--- 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"));