relationlists: Rename _count() and _get_clone()

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index 3a7a09f3cfc393ca42e3047eefd7371c8cb15202..8f7ffc61613eba63858d01ea4e8b778ffd04c568 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -461,10 +461,10 @@ static PyObject* PyList_FromRelationList(PakfireRelationList relationlist) {
        if (list == NULL)
                return NULL;
 
-       const int count = pakfire_relationlist_count(relationlist);
+       const size_t count = pakfire_relationlist_size(relationlist);
 
-       for (int i = 0; i < count; i++) {
-               PakfireRelation relation = pakfire_relationlist_get_clone(relationlist, i);
+       for (unsigned int i = 0; i < count; i++) {
+               PakfireRelation relation = pakfire_relationlist_get(relationlist, i);
                PyObject* relation_obj = new_relation(&RelationType, relation);
 
                pakfire_relation_unref(relation);

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index f4769c3dd0d7d8c8de39066f252916db224ed5f8..f49c18c551505e0e77b9d0af23c1674c876e2e5f 100644 (file)
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -659,8 +659,8 @@ static int pakfire_db_add_dependencies(struct pakfire_db* db, unsigned long id,
                if (!list)
                        continue;
 
-               for (int i = 0; i < pakfire_relationlist_count(list); i++) {
-                       PakfireRelation rel = pakfire_relationlist_get_clone(list, i);
+               for (unsigned int i = 0; i < pakfire_relationlist_size(list); i++) {
+                       PakfireRelation rel = pakfire_relationlist_get(list, i);
                        if (!rel)
                                goto END;
 

diff --git a/src/libpakfire/include/pakfire/relationlist.h b/src/libpakfire/include/pakfire/relationlist.h
index 99e73bab4e3df77a7e522c47467acfb011644e65..b733efdb01fe67090606a96b7b4fbb7253109a7f 100644 (file)
--- a/src/libpakfire/include/pakfire/relationlist.h
+++ b/src/libpakfire/include/pakfire/relationlist.h
@@ -31,9 +31,9 @@ PakfireRelationList pakfire_relationlist_ref(PakfireRelationList relationlist);
 PakfireRelationList pakfire_relationlist_unref(PakfireRelationList relationlist);
 
 void pakfire_relationlist_add(PakfireRelationList relationlist, PakfireRelation relation);
-int pakfire_relationlist_count(PakfireRelationList relationlist);
+size_t pakfire_relationlist_size(PakfireRelationList relationlist);
 
-PakfireRelation pakfire_relationlist_get_clone(PakfireRelationList relationlist, int index);
+PakfireRelation pakfire_relationlist_get(PakfireRelationList relationlist, int index);
 
 #ifdef PAKFIRE_PRIVATE
 

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 3b1fe200108fb44693f0c1830d27692e55ecdf9d..99087a39b66ae27c42d92f89b36c5327fb1e1852 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -311,11 +311,11 @@ global:
 
        # relationlist
        pakfire_relationlist_add;
-       pakfire_relationlist_count;
        pakfire_relationlist_create;
        pakfire_relationlist_create_from_string;
-       pakfire_relationlist_get_clone;
+       pakfire_relationlist_get;
        pakfire_relationlist_ref;
+       pakfire_relationlist_size;
        pakfire_relationlist_unref;
 
        # request

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 636f16e945586bb418ba5313771db747870587e2..a08eb18909fb5224a7ece4cab8890baf49153e09 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -545,9 +545,9 @@ static void pakfire_package_set_relationlist(PakfirePackage pkg, Id type, Pakfir
        Solvable* s = get_solvable(pkg);
        solvable_unset(s, type);
 
-       int count = pakfire_relationlist_count(relationlist);
-       for (int i = 0; i < count; i++) {
-               PakfireRelation relation = pakfire_relationlist_get_clone(relationlist, i);
+       size_t size = pakfire_relationlist_size(relationlist);
+       for (unsigned int i = 0; i < size; i++) {
+               PakfireRelation relation = pakfire_relationlist_get(relationlist, i);
                solvable_add_idarray(s, type, pakfire_relation_get_id(relation));
 
                pakfire_relation_unref(relation);
@@ -702,9 +702,9 @@ static void pakfire_package_dump_add_line_date(char** str, const char* key, unsi
 }
 
 static void pakfire_package_dump_add_line_relations(char** str, const char* key, PakfireRelationList deps) {
-       int count = pakfire_relationlist_count(deps);
-       for (int i = 0; i < count; i++) {
-               PakfireRelation relation = pakfire_relationlist_get_clone(deps, i);
+       size_t size = pakfire_relationlist_size(deps);
+       for (unsigned int i = 0; i < size; i++) {
+               PakfireRelation relation = pakfire_relationlist_get(deps, i);
 
                if (relation) {
                        char* dep = pakfire_relation_str(relation);

diff --git a/src/libpakfire/relationlist.c b/src/libpakfire/relationlist.c
index 5b7c4420788cadc4639e6aa9be9d93b936c8f027..11fde75af976bf27c0df294b482e21fc66cf4c2b 100644 (file)
--- a/src/libpakfire/relationlist.c
+++ b/src/libpakfire/relationlist.c
@@ -106,7 +106,7 @@ PAKFIRE_EXPORT void pakfire_relationlist_add(PakfireRelationList relationlist, P
        queue_push(&relationlist->queue, pakfire_relation_get_id(relation));
 }
 
-PAKFIRE_EXPORT int pakfire_relationlist_count(PakfireRelationList relationlist) {
+PAKFIRE_EXPORT size_t pakfire_relationlist_size(PakfireRelationList relationlist) {
        return relationlist->queue.count;
 }
 
@@ -124,12 +124,15 @@ PAKFIRE_EXPORT int pakfire_relationlist_from_queue(PakfireRelationList* list, Pa
        return 0;
 }
 
-PAKFIRE_EXPORT PakfireRelation pakfire_relationlist_get_clone(PakfireRelationList relationlist, int index) {
+PAKFIRE_EXPORT PakfireRelation pakfire_relationlist_get(PakfireRelationList relationlist, int index) {
+       if (index >= relationlist->queue.count)
+               return NULL;
+
        Id id = relationlist->queue.elements[index];
 
        return pakfire_relation_create_from_id(relationlist->pakfire, id);
 }
 
-PAKFIRE_EXPORT void pakfire_relationlist_clone_to_queue(PakfireRelationList relationlist, Queue* q) {
+void pakfire_relationlist_clone_to_queue(PakfireRelationList relationlist, Queue* q) {
        queue_init_clone(q, &relationlist->queue);
 }