repo: Cleanup argument order when downloading packages

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

diff --git a/src/libpakfire/include/pakfire/repo.h b/src/libpakfire/include/pakfire/repo.h
index 727879f5a4dc8b5c9cdf16c86bcd0ea9c13fecd7..71b07753bb5694733a367694f7d8ee6279411287 100644 (file)
--- a/src/libpakfire/include/pakfire/repo.h
+++ b/src/libpakfire/include/pakfire/repo.h
@@ -124,11 +124,8 @@ Id pakfire_repo_add_solvable(struct pakfire_repo* repo);
 int pakfire_repo_add_archive(struct pakfire_repo* repo,
        struct pakfire_archive* archive, struct pakfire_package** package);
 
-int pakfire_repo_download_package(
-       struct pakfire_repo* repo,
-       struct pakfire_httpclient* httpclient,
-       struct pakfire_package* pkg,
-       struct pakfire_xfer** xfer);
+int pakfire_repo_download_package(struct pakfire_xfer** xfer,
+       struct pakfire_repo* repo, struct pakfire_package* pkg);
 
 int pakfire_repo_add(struct pakfire_repo* repo, const char* path,
        struct pakfire_package** package);

diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index 54b87aa6b5abf0e1f6ff61ef669c357daeef1296..82e845e795772203f3ce3da4fda16845eaf4d625 100644 (file)
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -1176,8 +1176,8 @@ PAKFIRE_EXPORT int pakfire_repo_is_installed_repo(struct pakfire_repo* repo) {
        return (r == 0);
 }
 
-int pakfire_repo_download_package(struct pakfire_repo* repo, struct pakfire_httpclient* httpclient,
-               struct pakfire_package* pkg, struct pakfire_xfer** xfer) {
+int pakfire_repo_download_package(struct pakfire_xfer** xfer,
+               struct pakfire_repo* repo, struct pakfire_package* pkg) {
        struct pakfire_xfer* x = NULL;
        const unsigned char* digest = NULL;
        const char* cache_path = NULL;

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 4c30078eb6dec03597441ecf718c053c677e5c81..035ce9a2295496f2aa74784edbfa54bc18413815 100644 (file)
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -1832,15 +1832,17 @@ static int pakfire_transaction_download_package(struct pakfire_transaction* tran
                struct pakfire_httpclient* httpclient, struct pakfire_package* pkg) {
        struct pakfire_repo* repo = NULL;
        struct pakfire_xfer* xfer = NULL;
-       int r = 1;
+       int r;
 
        // Fetch the repository to download from
        repo = pakfire_package_get_repo(pkg);
-       if (!repo)
+       if (!repo) {
+               r = -errno;
                goto ERROR;
+       }
 
        // Create a xfer for this package
-       r = pakfire_repo_download_package(repo, httpclient, pkg, &xfer);
+       r = pakfire_repo_download_package(&xfer, repo, pkg);
        if (r)
                goto ERROR;