packagelist: Create its own type

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

diff --git a/src/cli/lib/dump.c b/src/cli/lib/dump.c
index 7055361ddd901bb381957c55d41db757bed81afc..ac6153cbc58820699f70b1aff8a989c5740942cc 100644 (file)
--- a/src/cli/lib/dump.c
+++ b/src/cli/lib/dump.c
@@ -61,7 +61,7 @@ static int __cli_dump_package(pakfire_ctx* ctx, struct pakfire_package* package,
        return cli_dump_package(package, flags);
 }
 
-int cli_dump_packagelist(struct pakfire_packagelist* list, int flags) {
+int cli_dump_packagelist(pakfire_packagelist* list, int flags) {
        return pakfire_packagelist_walk(list, __cli_dump_package, &flags, 0);
 }
 

diff --git a/src/cli/lib/dump.h b/src/cli/lib/dump.h
index 4b7d9ce845292ce6e882a0eaf0aa798c1bb68b37..da9d1bd06a8ff9308790edfde5f7bc2746f83b06 100644 (file)
--- a/src/cli/lib/dump.h
+++ b/src/cli/lib/dump.h
@@ -29,7 +29,7 @@
 #include <pakfire/repolist.h>
 
 int cli_dump_package(struct pakfire_package* package, int flags);
-int cli_dump_packagelist(struct pakfire_packagelist* list, int flags);
+int cli_dump_packagelist(pakfire_packagelist* list, int flags);
 
 int cli_dump_repolist(struct pakfire_repolist* list, int flags);
 

diff --git a/src/cli/lib/info.c b/src/cli/lib/info.c
index fc578cd309da1677862223616e8354f61bfca2ea..6d25aa82adeafacba69104be3d145c42fe0fbdc0 100644 (file)
--- a/src/cli/lib/info.c
+++ b/src/cli/lib/info.c
@@ -84,7 +84,7 @@ int cli_info(void* data, int argc, char* argv[]) {
        struct cli_global_args* global_args = data;
        struct cli_local_args local_args = {};
        struct pakfire* pakfire = NULL;
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        int r;
 
        // Parse the command line

diff --git a/src/cli/lib/provides.c b/src/cli/lib/provides.c
index 475ba4f5ab9634186a1649baa7c04bd48bb1a0a5..cb654cb06c968aaa7197a655df632da84e7f0700 100644 (file)
--- a/src/cli/lib/provides.c
+++ b/src/cli/lib/provides.c
@@ -60,7 +60,7 @@ int cli_provides(void* data, int argc, char* argv[]) {
        struct cli_global_args* global_args = data;
        struct cli_local_args local_args = {};
        struct pakfire* pakfire = NULL;
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        int r;
 
        // Parse the command line

diff --git a/src/cli/lib/requires.c b/src/cli/lib/requires.c
index fce0195a65e3e9ed479828f399d2b8b0fdcae702..80aae265678c19f6251055f55c05d7d8b21111ae 100644 (file)
--- a/src/cli/lib/requires.c
+++ b/src/cli/lib/requires.c
@@ -60,7 +60,7 @@ int cli_requires(void* data, int argc, char* argv[]) {
        struct cli_global_args* global_args = data;
        struct cli_local_args local_args = {};
        struct pakfire* pakfire = NULL;
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        int r;
 
        // Parse the command line

diff --git a/src/cli/lib/search.c b/src/cli/lib/search.c
index 0fa76a29e32df2465762ef0d636a2a4eebb29977..61aaf613676ac41b07433f84ccc3aa189e33d211 100644 (file)
--- a/src/cli/lib/search.c
+++ b/src/cli/lib/search.c
@@ -60,7 +60,7 @@ int cli_search(void* data, int argc, char* argv[]) {
        struct cli_global_args* global_args = data;
        struct cli_local_args local_args = {};
        struct pakfire* pakfire = NULL;
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        int r;
 
        // Parse the command line

diff --git a/src/pakfire/package.c b/src/pakfire/package.c
index 12637eee9d8c7e40ae802ccfcfcc5f3306f39d82..d0cb1209048ebdee529936fe93d9bbe7912ce813 100644 (file)
--- a/src/pakfire/package.c
+++ b/src/pakfire/package.c
@@ -1683,8 +1683,8 @@ int pakfire_package_add_dep(struct pakfire_package* pkg,
 }
 
 int pakfire_package_get_reverse_requires(struct pakfire_package* pkg,
-               struct pakfire_packagelist** ret) {
-       struct pakfire_packagelist* list = NULL;
+               pakfire_packagelist** ret) {
+       pakfire_packagelist* list = NULL;
        Queue matches;
        int r;
 

diff --git a/src/pakfire/package.h b/src/pakfire/package.h
index b70a947090814772281e55f6c124aa3607b1d838..2d02b834d2044497d363c29bb9faac5233db737b 100644 (file)
--- a/src/pakfire/package.h
+++ b/src/pakfire/package.h
@@ -139,7 +139,7 @@ int pakfire_package_set_checksum(struct pakfire_package* pkg,
 size_t pakfire_package_get_size(struct pakfire_package* pkg);
 
 int pakfire_package_get_reverse_requires(struct pakfire_package* pkg,
-       struct pakfire_packagelist** list);
+       pakfire_packagelist** list);
 
 struct pakfire_repo* pakfire_package_get_repo(struct pakfire_package* pkg);
 

diff --git a/src/pakfire/packagelist.c b/src/pakfire/packagelist.c
index d4e7c1befd52d2ce988c7b90c313ee9d6230cc8b..d29b43f7faa06e4abb0b6b6fa925187f6d7337b7 100644 (file)
--- a/src/pakfire/packagelist.c
+++ b/src/pakfire/packagelist.c
@@ -39,7 +39,7 @@ struct pakfire_packagelist {
        unsigned int num_packages;
 };
 
-static void pakfire_packagelist_clear(struct pakfire_packagelist* self) {
+static void pakfire_packagelist_clear(pakfire_packagelist* self) {
        if (self->packages) {
                for (unsigned int i = 0; i < self->num_packages; i++)
                        pakfire_package_unref(self->packages[i]);
@@ -53,7 +53,7 @@ static void pakfire_packagelist_clear(struct pakfire_packagelist* self) {
        }
 }
 
-static void pakfire_packagelist_free(struct pakfire_packagelist* list) {
+static void pakfire_packagelist_free(pakfire_packagelist* list) {
        pakfire_packagelist_clear(list);
 
        if (list->ctx)
@@ -61,8 +61,8 @@ static void pakfire_packagelist_free(struct pakfire_packagelist* list) {
        free(list);
 }
 
-int pakfire_packagelist_create(struct pakfire_packagelist** list, pakfire_ctx* ctx) {
-       struct pakfire_packagelist* self = NULL;
+int pakfire_packagelist_create(pakfire_packagelist** list, pakfire_ctx* ctx) {
+       pakfire_packagelist* self = NULL;
 
        // Allocate some memory
        self = calloc(1, sizeof(*self));
@@ -81,13 +81,13 @@ int pakfire_packagelist_create(struct pakfire_packagelist** list, pakfire_ctx* c
        return 0;
 }
 
-struct pakfire_packagelist* pakfire_packagelist_ref(struct pakfire_packagelist* self) {
+pakfire_packagelist* pakfire_packagelist_ref(pakfire_packagelist* self) {
        self->nrefs++;
 
        return self;
 }
 
-struct pakfire_packagelist* pakfire_packagelist_unref(struct pakfire_packagelist* self) {
+pakfire_packagelist* pakfire_packagelist_unref(pakfire_packagelist* self) {
        if (--self->nrefs > 0)
                return self;
 
@@ -95,11 +95,11 @@ struct pakfire_packagelist* pakfire_packagelist_unref(struct pakfire_packagelist
        return NULL;
 }
 
-size_t pakfire_packagelist_length(struct pakfire_packagelist* self) {
+size_t pakfire_packagelist_length(pakfire_packagelist* self) {
        return self->num_packages;
 }
 
-struct pakfire_package* pakfire_packagelist_get(struct pakfire_packagelist* self, unsigned int index) {
+struct pakfire_package* pakfire_packagelist_get(pakfire_packagelist* self, unsigned int index) {
        // Check that index is in range
        if (index >= self->num_packages) {
                errno = ERANGE;
@@ -109,7 +109,7 @@ struct pakfire_package* pakfire_packagelist_get(struct pakfire_packagelist* self
        return pakfire_package_ref(self->packages[index]);
 }
 
-static int pakfire_packagelist_search(struct pakfire_packagelist* self, struct pakfire_package* pkg) {
+static int pakfire_packagelist_search(pakfire_packagelist* self, struct pakfire_package* pkg) {
        int i;
        int r;
 
@@ -136,7 +136,7 @@ static int pakfire_packagelist_search(struct pakfire_packagelist* self, struct p
        return lo;
 }
 
-int pakfire_packagelist_add(struct pakfire_packagelist* self, struct pakfire_package* pkg) {
+int pakfire_packagelist_add(pakfire_packagelist* self, struct pakfire_package* pkg) {
        // Find the index where the package should go
        int pos = pakfire_packagelist_search(self, pkg);
 
@@ -160,7 +160,7 @@ int pakfire_packagelist_add(struct pakfire_packagelist* self, struct pakfire_pac
        return 0;
 }
 
-int pakfire_packagelist_add_list(struct pakfire_packagelist* self, struct pakfire_packagelist* other) {
+int pakfire_packagelist_add_list(pakfire_packagelist* self, pakfire_packagelist* other) {
        int r;
 
        // Add all packages from the other list
@@ -173,7 +173,7 @@ int pakfire_packagelist_add_list(struct pakfire_packagelist* self, struct pakfir
        return 0;
 }
 
-int pakfire_packagelist_walk(struct pakfire_packagelist* self,
+int pakfire_packagelist_walk(pakfire_packagelist* self,
                pakfire_packagelist_walk_callback callback, void* data, int flags) {
        int kept_going = 0;
        int r = 0;
@@ -202,7 +202,7 @@ int pakfire_packagelist_walk(struct pakfire_packagelist* self,
        return (kept_going > 0) ? kept_going : r;
 }
 
-int pakfire_packagelist_import_solvables(struct pakfire_packagelist* self,
+int pakfire_packagelist_import_solvables(pakfire_packagelist* self,
                struct pakfire* pakfire, Queue* q) {
        struct pakfire_package* pkg = NULL;
        int r;
@@ -234,6 +234,6 @@ static int __pakfire_packagelist_has_path(
        return pakfire_string_equals(pkg_path, path);
 }
 
-int pakfire_packagelist_has_path(struct pakfire_packagelist* self, const char* path) {
+int pakfire_packagelist_has_path(pakfire_packagelist* self, const char* path) {
        return pakfire_packagelist_walk(self, __pakfire_packagelist_has_path, (char*)path, 0);
 }

diff --git a/src/pakfire/packagelist.h b/src/pakfire/packagelist.h
index e653e8f2d0d4849bf26bee7e842cf638397de40a..ccfb939c40f6529d149c7b58c9a72e9527a1778c 100644 (file)
--- a/src/pakfire/packagelist.h
+++ b/src/pakfire/packagelist.h
@@ -23,21 +23,21 @@
 
 #include <solv/queue.h>
 
-struct pakfire_packagelist;
+typedef struct pakfire_packagelist pakfire_packagelist;
 
 #include <pakfire/ctx.h>
 #include <pakfire/package.h>
 #include <pakfire/pakfire.h>
 
-int pakfire_packagelist_create(struct pakfire_packagelist** list, pakfire_ctx* ctx);
-struct pakfire_packagelist* pakfire_packagelist_ref(struct pakfire_packagelist* list);
-struct pakfire_packagelist* pakfire_packagelist_unref(struct pakfire_packagelist* list);
+int pakfire_packagelist_create(pakfire_packagelist** list, pakfire_ctx* ctx);
+pakfire_packagelist* pakfire_packagelist_ref(pakfire_packagelist* list);
+pakfire_packagelist* pakfire_packagelist_unref(pakfire_packagelist* list);
 
-size_t pakfire_packagelist_length(struct pakfire_packagelist* list);
-struct pakfire_package* pakfire_packagelist_get(struct pakfire_packagelist* list, unsigned int index);
+size_t pakfire_packagelist_length(pakfire_packagelist* list);
+struct pakfire_package* pakfire_packagelist_get(pakfire_packagelist* list, unsigned int index);
 
-int pakfire_packagelist_add(struct pakfire_packagelist* list, struct pakfire_package* pkg);
-int pakfire_packagelist_add_list(struct pakfire_packagelist* self, struct pakfire_packagelist* other);
+int pakfire_packagelist_add(pakfire_packagelist* list, struct pakfire_package* pkg);
+int pakfire_packagelist_add_list(pakfire_packagelist* self, pakfire_packagelist* other);
 
 typedef int (*pakfire_packagelist_walk_callback)
        (pakfire_ctx* ctx, struct pakfire_package* pkg, void* p);
@@ -46,12 +46,12 @@ enum pakfire_packagelist_walk_flags {
        PAKFIRE_PACKAGELIST_KEEPGOING = (1 << 0),
 };
 
-int pakfire_packagelist_walk(struct pakfire_packagelist* list,
+int pakfire_packagelist_walk(pakfire_packagelist* list,
        pakfire_packagelist_walk_callback callback, void* p, int flags);
 
-int pakfire_packagelist_import_solvables(struct pakfire_packagelist* list,
+int pakfire_packagelist_import_solvables(pakfire_packagelist* list,
        struct pakfire* pakfire, Queue* q);
 
-int pakfire_packagelist_has_path(struct pakfire_packagelist* self, const char* path);
+int pakfire_packagelist_has_path(pakfire_packagelist* self, const char* path);
 
 #endif /* PAKFIRE_PACKAGELIST_H */

diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c
index eef33ed9b9fcf27faa3814d0fb81d965c7a83cef..5c50fdf1071651aee44b248cfcfd09847b35a001 100644 (file)
--- a/src/pakfire/pakfire.c
+++ b/src/pakfire/pakfire.c
@@ -1499,7 +1499,7 @@ ERROR:
        return r;
 }
 
-static int __pakfire_search(struct pakfire* pakfire, struct pakfire_packagelist* list,
+static int __pakfire_search(struct pakfire* pakfire, pakfire_packagelist* list,
                const Id* keys, const char* what, int flags) {
        Dataiterator di;
        Queue matches;
@@ -1536,7 +1536,7 @@ ERROR:
 }
 
 static int pakfire_search_filelist(struct pakfire* pakfire, const char* what, int flags,
-               struct pakfire_packagelist* list) {
+               pakfire_packagelist* list) {
        const Id keys[] = {
                SOLVABLE_FILELIST,
                ID_NULL,
@@ -1546,7 +1546,7 @@ static int pakfire_search_filelist(struct pakfire* pakfire, const char* what, in
 }
 
 static int pakfire_search_dep(struct pakfire* pakfire, Id type, const char* what, int flags,
-               struct pakfire_packagelist* list) {
+               pakfire_packagelist* list) {
        int r;
 
        // Get the pool ready
@@ -1577,7 +1577,7 @@ ERROR:
 }
 
 int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags,
-               struct pakfire_packagelist* list) {
+               pakfire_packagelist* list) {
        int r;
 
        // Check for valid input
@@ -1602,8 +1602,8 @@ int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags,
 }
 
 static int __pakfire_whatrequires(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data) {
-       struct pakfire_packagelist* reverse = NULL;
-       struct pakfire_packagelist* list = data;
+       pakfire_packagelist* reverse = NULL;
+       pakfire_packagelist* list = data;
        int r;
 
        // Fetch all elements
@@ -1624,8 +1624,8 @@ ERROR:
 }
 
 int pakfire_whatrequires(struct pakfire* pakfire, const char* what, int flags,
-               struct pakfire_packagelist* list) {
-       struct pakfire_packagelist* packages = NULL;
+               pakfire_packagelist* list) {
+       pakfire_packagelist* packages = NULL;
        int r;
 
        const Id keys[] = {
@@ -1661,7 +1661,7 @@ ERROR:
 }
 
 int pakfire_search(struct pakfire* pakfire, const char* what, int flags,
-               struct pakfire_packagelist* list) {
+               pakfire_packagelist* list) {
        const Id keys[] = {
                SOLVABLE_NAME,
                SOLVABLE_SUMMARY,

diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h
index f27b6b4a4847cfc7c5737c765bd642a4ae0825c3..53a06e5bbe1cbbd05b3e01c631ef763377cc2b4d 100644 (file)
--- a/src/pakfire/pakfire.h
+++ b/src/pakfire/pakfire.h
@@ -77,9 +77,9 @@ struct pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire);
 struct pakfire_repo* pakfire_get_repo(struct pakfire* pakfire, const char* name);
 
 int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags,
-       struct pakfire_packagelist* list);
+       pakfire_packagelist* list);
 int pakfire_whatrequires(struct pakfire* pakfire, const char* what, int flags,
-       struct pakfire_packagelist* list);
+       pakfire_packagelist* list);
 
 // Search
 
@@ -88,7 +88,7 @@ enum pakfire_search_flags {
 };
 
 int pakfire_search(struct pakfire* pakfire, const char* what, int flags,
-       struct pakfire_packagelist* list);
+       pakfire_packagelist* list);
 
 // Check
 

diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c
index b6a761b2f9a96294c1e3f161af9ecb7f39c9fa86..a152846fe59f967c37974357ecf38cd466c1d78a 100644 (file)
--- a/src/pakfire/repo.c
+++ b/src/pakfire/repo.c
@@ -442,8 +442,8 @@ int pakfire_repo_import(struct pakfire* pakfire, pakfire_config* config) {
 }
 
 static int pakfire_repo_to_packagelist(
-               struct pakfire_repo* self, struct pakfire_packagelist** list) {
-       struct pakfire_packagelist* l = NULL;
+               struct pakfire_repo* self, pakfire_packagelist** list) {
+       pakfire_packagelist* l = NULL;
        struct pakfire_package* pkg = NULL;
        Solvable* s = NULL;
        Id id;
@@ -605,7 +605,7 @@ struct pakfire_repo_scan_ctx {
        unsigned int num_archives;
 
        // Packages
-       struct pakfire_packagelist* packages;
+       pakfire_packagelist* packages;
 };
 
 typedef int (*pakfire_repo_scan_callback)(
@@ -2666,7 +2666,7 @@ ERROR:
 
 int pakfire_repo_walk_packages(struct pakfire_repo* self,
                int (*callback)(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data), void* data, int flags) {
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        int r;
 
        // Import all packages
@@ -2717,7 +2717,7 @@ static int __pakfire_repo_walk_archives(
 
 int pakfire_repo_walk_archives(struct pakfire_repo* self,
                pakfire_repo_walk_archives_callback callback, void* data, int flags) {
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        int r;
 
        struct pakfire_repo_walk_archives_state state = {

diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c
index 17262e9647f2f70c884d76ac54ae59dd295b9293..9dea15f4f6a605eb24ddd200e8bff7bf34bc83ca 100644 (file)
--- a/src/pakfire/transaction.c
+++ b/src/pakfire/transaction.c
@@ -70,8 +70,8 @@ struct pakfire_transaction {
        struct pakfire_progress* progress;
 
        // Changes for file conflicts
-       struct pakfire_packagelist* installed_packages;
-       struct pakfire_packagelist* new_packages;
+       pakfire_packagelist* installed_packages;
+       pakfire_packagelist* new_packages;
 };
 
 enum pakfire_actions {

diff --git a/src/python/package.c b/src/python/package.c
index a238ee98ade460dc8e44bd649912bca06de09fb5..c9fd029b50613e0d2b37573ae4835171885bb0b4 100644 (file)
--- a/src/python/package.c
+++ b/src/python/package.c
@@ -399,7 +399,7 @@ static PyObject* Package_get_suggests(PackageObject* self) {
 }
 
 static PyObject* Package_get_reverse_requires(PackageObject* self) {
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        PyObject* ret = NULL;
        int r;
 

diff --git a/src/python/pakfire.c b/src/python/pakfire.c
index ddd1352118fe17096434a101bdf43fbff8bb3f51..e75170e8e318f2b8f04c48e1c7ce10f6149264a9 100644 (file)
--- a/src/python/pakfire.c
+++ b/src/python/pakfire.c
@@ -234,7 +234,7 @@ ERROR:
 
 static PyObject* Pakfire_whatprovides(PakfireObject* self, PyObject* args) {
        const char* provides = NULL;
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        PyObject* ret = NULL;
        int r;
 
@@ -267,7 +267,7 @@ ERROR:
 }
 
 static PyObject* Pakfire_whatrequires(PakfireObject* self, PyObject* args) {
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        const char* requires = NULL;
        PyObject* ret = NULL;
        int r;
@@ -308,7 +308,7 @@ ERROR:
 
 static PyObject* Pakfire_search(PakfireObject* self, PyObject* args, PyObject* kwds) {
        const char* kwlist[] = { "pattern", "name_only", NULL };
-       struct pakfire_packagelist* list = NULL;
+       pakfire_packagelist* list = NULL;
        const char* pattern = NULL;
        int name_only = 0;
        int flags = 0;

diff --git a/src/python/util.c b/src/python/util.c
index 1dc0ffc663dbc86002664548f6249f000f96987c..853af27380f9992cdfb9eb41dfb7ba023d4fda94 100644 (file)
--- a/src/python/util.c
+++ b/src/python/util.c
@@ -62,7 +62,7 @@ ERROR:
        return NULL;
 }
 
-PyObject* PyList_FromPackageList(struct pakfire_packagelist* packagelist) {
+PyObject* PyList_FromPackageList(pakfire_packagelist* packagelist) {
        struct pakfire_package* package = NULL;
        PyObject* item = NULL;
 

diff --git a/src/python/util.h b/src/python/util.h
index 545080e87112e6c2306f0f79d683e71331c5bb64..e454a04c7513b45aea77172a88d097f92381a1cf 100644 (file)
--- a/src/python/util.h
+++ b/src/python/util.h
@@ -28,7 +28,7 @@
 
 PyObject* PyUnicodeList_FromStringArray(const char** l);
 
-PyObject* PyList_FromPackageList(struct pakfire_packagelist* packagelist);
+PyObject* PyList_FromPackageList(pakfire_packagelist* packagelist);
 PyObject* PyList_FromFileList(pakfire_filelist* filelist);
 
 PyObject* PyDateTime_FromTime_t(const time_t* t);