From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 21 Feb 2023 16:56:12 +0000 (+0000)
Subject: filelists: Rename *_size() -> *_length()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94ff3014a89c8012632287ff1b9359fc392a2809;p=people%2Fstevee%2Fpakfire.git

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 120fdf48..fdb6f118 100644
--- 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 68b97bde..40d97bcd 100644
--- 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 69e20c6d..4f883d09 100644
--- 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 1d06bf26..0b8afb13 100644
--- 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 cdec5ccd..3483b346 100644
--- 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 6ca61198..cc28d8e3 100644
--- 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 9b047ffb..00f143ba 100644
--- 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 5741532c..c4597728 100644
--- 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 895c6506..abd38f40 100644
--- 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 05136a98..4a94912c 100644
--- 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 42b688e2..6a991629 100644
--- 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 08121349..2c97ea20 100644
--- 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 48efddb0..a36e2974 100644
--- 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 a2b9d276..36564f3f 100644
--- 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 7c1e7359..8c976406 100644
--- 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