filelists: Rename *_size() -> *_length()

Also call *_is_empty() wherever suitable as it is much faster.

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index 120fdf48f46c139bf425a5806517c649ccaf1d15..fdb6f118d377e3692b2bb7d35243dfc04d642def 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -530,7 +530,7 @@ static PyObject* Package_get_filelist(PackageObject* self, PyObject* args) {
                return NULL;
 
        struct pakfire_filelist* filelist = pakfire_package_get_filelist(self->package);
-       for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) {
+       for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
                struct pakfire_file* file = pakfire_filelist_get(filelist, i);
                const char* path = pakfire_file_get_path(file);
                pakfire_file_unref(file);

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index 68b97bdebfe94ee6b4a5c03c976061c564eb8cc9..40d97bcd43263a17260c956bd944171a993c5625 100644 (file)
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -1210,7 +1210,7 @@ static PyObject* Pakfire_check(PakfireObject* self) {
        if (r)
                goto ERROR;
 
-       const size_t num_errors = pakfire_filelist_size(errors);
+       const size_t num_errors = pakfire_filelist_length(errors);
 
        // Did we find any errors?
        if (num_errors) {

diff --git a/src/_pakfire/util.c b/src/_pakfire/util.c
index 69e20c6d4489e1b69cfb658b12b7d8c5a05c01a7..4f883d09c489ca576b1a4afb8a7953017d79897d 100644 (file)
--- a/src/_pakfire/util.c
+++ b/src/_pakfire/util.c
@@ -112,7 +112,7 @@ PyObject* PyList_FromFileList(struct pakfire_filelist* filelist) {
                goto ERROR;
 
        // Fetch size
-       const size_t size = pakfire_filelist_size(filelist);
+       const size_t size = pakfire_filelist_length(filelist);
 
        for (unsigned int i = 0; i < size; i++) {
                file = pakfire_filelist_get(filelist, i);

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 1d06bf26ac356e189ff8d82f19df73e0f2499abb..0b8afb137a59a06bfe7b7e0df968851a23476609 100644 (file)
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -303,7 +303,7 @@ static int pakfire_build_send_filelist(struct pakfire* pakfire, void* data, int
        struct pakfire_file* file = NULL;
        int r = 0;
 
-       const size_t length = pakfire_filelist_size(ctx->filelist);
+       const size_t length = pakfire_filelist_length(ctx->filelist);
 
        // Check if we have reached the end of the filelist
        if (ctx->i >= length)
@@ -614,11 +614,10 @@ static int pakfire_build_package_add_files(struct pakfire_build* build,
        if (r)
                goto ERROR;
 
-       const size_t length = pakfire_filelist_size(filelist);
-       DEBUG(build->pakfire, "%zu file(s) found\n", length);
+       DEBUG(build->pakfire, "%zu file(s) found\n", pakfire_filelist_length(filelist));
 
        // Nothing to do if the filelist is empty
-       if (!length)
+       if (pakfire_filelist_is_empty(filelist))
                goto ERROR;
 
        // Dump the filelist
@@ -1083,10 +1082,8 @@ static int pakfire_build_run_post_build_checks(struct pakfire_build* build) {
        if (r)
                goto ERROR;
 
-       const size_t length = pakfire_filelist_size(filelist);
-
        // If the filelist is empty, we can are done
-       if (length == 0) {
+       if (pakfire_filelist_is_empty(filelist)) {
                DEBUG(build->pakfire, "Empty BUILDROOT. Skipping post build checks...\n");
                r = 0;
                goto ERROR;
@@ -1624,9 +1621,7 @@ static int pakfire_build_check_unpackaged_files(struct pakfire_build* build) {
        if (r)
                goto ERROR;
 
-       const size_t length = pakfire_filelist_size(filelist);
-
-       if (length) {
+       if (!pakfire_filelist_is_empty(filelist)) {
                ERROR(build->pakfire, "Unpackaged files found:\n");
 
                r = pakfire_filelist_walk(filelist, __pakfire_build_unpackaged_file, NULL);

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index cdec5ccdb91859cf7199f4a3c95d0c70f2b217d3..3483b346dabc2eb645a2fb42e2ab8a8bbadf4b28 100644 (file)
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -973,7 +973,7 @@ static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, struct
                goto END;
        }
 
-       for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) {
+       for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
                struct pakfire_file* file = pakfire_filelist_get(filelist, i);
 
                // Bind package ID

diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index 6ca61198ebaed0a11168b5f04839dc9f16ce66c3..cc28d8e316de6ed2467c9e254b465372f614818a 100644 (file)
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -85,7 +85,7 @@ PAKFIRE_EXPORT struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_fi
        return NULL;
 }
 
-PAKFIRE_EXPORT size_t pakfire_filelist_size(struct pakfire_filelist* list) {
+PAKFIRE_EXPORT size_t pakfire_filelist_length(struct pakfire_filelist* list) {
        struct pakfire_filelist_element* element = NULL;
        size_t size = 0;
 
@@ -458,7 +458,7 @@ int pakfire_filelist_verify(struct pakfire_filelist* list, struct pakfire_fileli
        int status;
        int r;
 
-       const size_t length = pakfire_filelist_size(list);
+       const size_t length = pakfire_filelist_length(list);
 
        DEBUG(list->pakfire, "Verifying filelist (%zu file(s))...\n", length);
 

diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h
index 9b047ffbdb0650f6c4e852072668df6be0e6b798..00f143ba39dc59a6f0e50200e23e50fc78c41080 100644 (file)
--- a/src/libpakfire/include/pakfire/filelist.h
+++ b/src/libpakfire/include/pakfire/filelist.h
@@ -30,7 +30,7 @@ int pakfire_filelist_create(struct pakfire_filelist** list, struct pakfire* pakf
 struct pakfire_filelist* pakfire_filelist_ref(struct pakfire_filelist* list);
 struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list);
 
-size_t pakfire_filelist_size(struct pakfire_filelist* list);
+size_t pakfire_filelist_length(struct pakfire_filelist* list);
 int pakfire_filelist_is_empty(struct pakfire_filelist* list);
 void pakfire_filelist_clear(struct pakfire_filelist* list);
 

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 5741532c1fbd7feb0edb87460f4cc0d479ba03c4..c459772808e749434f26722b6dbb5a78574a5c1e 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -120,8 +120,8 @@ global:
        pakfire_filelist_create;
        pakfire_filelist_get;
        pakfire_filelist_is_empty;
+       pakfire_filelist_length;
        pakfire_filelist_ref;
-       pakfire_filelist_size;
        pakfire_filelist_unref;
 
        # key

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 895c650661c63fe75e4af15195bf9255ea6fa4f0..abd38f408c5e2537ae760654dc29282f105ce332 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -1398,7 +1398,7 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags
 
                const char* prefix = _("Filelist");
 
-               for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) {
+               for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
                        struct pakfire_file* file = pakfire_filelist_get(filelist, i);
 
                        const char* path = pakfire_file_get_path(file);

diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index 05136a984c06b13b44f230fcb3b34a4f21eadab0..4a94912cdbfb555bbdbd1562e44677208bb2c29c 100644 (file)
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -1213,7 +1213,7 @@ PAKFIRE_EXPORT int pakfire_repo_scan(struct pakfire_repo* repo, int flags) {
                goto ERROR;
 
        // Fetch how many files have been found
-       const size_t num_files = pakfire_filelist_size(filelist);
+       const size_t num_files = pakfire_filelist_length(filelist);
 
        // Create progressbar
        r = pakfire_progressbar_create(&progressbar, NULL);

diff --git a/src/libpakfire/snapshot.c b/src/libpakfire/snapshot.c
index 42b688e2a99e147647b5ced059b4f2045367d143..6a9916296e10563fa6c0a18b2f997ce3a0194bc7 100644 (file)
--- a/src/libpakfire/snapshot.c
+++ b/src/libpakfire/snapshot.c
@@ -108,10 +108,8 @@ int pakfire_snapshot_create(struct pakfire* pakfire, const char* path) {
        if (r)
                goto ERROR;
 
-       const size_t size = pakfire_filelist_size(filelist);
-
        // Check if we have any files
-       if (!size) {
+       if (pakfire_filelist_is_empty(filelist)) {
                ERROR(pakfire, "The snapshot is unexpectedly empty\n");
                r = 1;
                goto ERROR;

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 0812134906bbd9ee9dbe1374b0ad270bb47a4c68..2c97ea2006b2d9d0dd77c1e8119e8a02e9a57aaa 100644 (file)
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -750,7 +750,7 @@ static int pakfire_transaction_erase(struct pakfire_transaction* transaction,
        if (r)
                goto ERROR;
 
-       const size_t length = pakfire_filelist_size(filelist);
+       const size_t length = pakfire_filelist_length(filelist);
 
        // Delete all files
        for (unsigned int i = 0; i < length; i++) {

diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c
index 48efddb09e258160ce43583e0cccda94ebb0de07..a36e2974549b970314f40c95971d770153fcc967 100644 (file)
--- a/tests/libpakfire/archive.c
+++ b/tests/libpakfire/archive.c
@@ -207,7 +207,7 @@ static int test_filelist(const struct test* t) {
        ASSERT(list = pakfire_archive_get_filelist(archive));
 
        // This packages has 7 files
-       ASSERT(pakfire_filelist_size(list) == 7);
+       ASSERT(pakfire_filelist_length(list) == 7);
 
        // Everything passed
        r =  EXIT_SUCCESS;

diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c
index a2b9d276529546fa88a3fa8b81a9340f2fab9859..36564f3fb1f0ee81bccd30489d65d55377c12535 100644 (file)
--- a/tests/libpakfire/makefile.c
+++ b/tests/libpakfire/makefile.c
@@ -249,7 +249,7 @@ static int test_dist_dummy(const struct test* t) {
        ASSERT(filelist);
 
        // There must be exactly one file in this package
-       ASSERT(pakfire_filelist_size(filelist) == 1);
+       ASSERT(pakfire_filelist_length(filelist) == 1);
 
        // Everything okay
        r = EXIT_SUCCESS;

diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c
index 7c1e73595211f8d691d7591637baa74db9fb518e..8c9764064bffb47db667d4db88ab42c8f96d3ae9 100644 (file)
--- a/tests/libpakfire/package.c
+++ b/tests/libpakfire/package.c
@@ -266,7 +266,7 @@ static int test_filelist(const struct test* t) {
        pakfire_file_unref(file);
        file = NULL;
 
-       ASSERT_EQUALS(pakfire_filelist_size(filelist), 1);
+       ASSERT_EQUALS(pakfire_filelist_length(filelist), 1);
 
        // Create a new package
        ASSERT_SUCCESS(pakfire_package_create(&pkg, t->pakfire, NULL,
@@ -283,9 +283,9 @@ static int test_filelist(const struct test* t) {
        ASSERT(filelist = pakfire_package_get_filelist(pkg));
 
        // The filelist must have a length of one
-       ASSERT_EQUALS(pakfire_filelist_size(filelist), 1);
+       ASSERT_EQUALS(pakfire_filelist_length(filelist), 1);
 
-       for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) {
+       for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
                ASSERT(file = pakfire_filelist_get(filelist, i));
 
                // Check the path