From: Michael Tremer Date: Thu, 29 Apr 2021 08:58:33 +0000 (+0000) Subject: transaction: Change type to struct X-Git-Tag: 0.9.28~1285^2~200 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d94fa31ee43592a1b7022b5fdcf128dcfc04439a;p=pakfire.git transaction: Change type to struct Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/request.c b/src/_pakfire/request.c index 06922bfdf..e1ec3cbbd 100644 --- a/src/_pakfire/request.c +++ b/src/_pakfire/request.c @@ -197,7 +197,7 @@ static PyObject* Request_solve(RequestObject* self, PyObject* args, PyObject *kw } // Allocate the transaction and return it - PakfireTransaction transaction = pakfire_request_get_transaction(self->request); + struct pakfire_transaction* transaction = pakfire_request_get_transaction(self->request); assert(transaction); return new_transaction(self, transaction); diff --git a/src/_pakfire/transaction.c b/src/_pakfire/transaction.c index caca9df72..80a4ac9fc 100644 --- a/src/_pakfire/transaction.c +++ b/src/_pakfire/transaction.c @@ -43,7 +43,7 @@ static TransactionObject* Transaction_new_core(PyTypeObject* type, RequestObject return self; } -PyObject* new_transaction(RequestObject* request, PakfireTransaction trans) { +PyObject* new_transaction(RequestObject* request, struct pakfire_transaction* trans) { TransactionObject* transaction = Transaction_new_core(&TransactionType, request); transaction->transaction = trans; diff --git a/src/_pakfire/transaction.h b/src/_pakfire/transaction.h index 6233e8688..4513cbc4e 100644 --- a/src/_pakfire/transaction.h +++ b/src/_pakfire/transaction.h @@ -23,18 +23,18 @@ #include -#include +#include #include "request.h" typedef struct { PyObject_HEAD RequestObject* request; - PakfireTransaction transaction; + struct pakfire_transaction* transaction; } TransactionObject; extern PyTypeObject TransactionType; -PyObject* new_transaction(RequestObject* request, PakfireTransaction trans); +PyObject* new_transaction(RequestObject* request, struct pakfire_transaction* trans); #endif /* PYTHON_PAKFIRE_TRANSACTION_H */ diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h index 1e19954d3..bdef5e8a5 100644 --- a/src/libpakfire/include/pakfire/request.h +++ b/src/libpakfire/include/pakfire/request.h @@ -46,7 +46,7 @@ struct pakfire_request* pakfire_request_unref(struct pakfire_request* request); int pakfire_request_solve(struct pakfire_request* request, int flags); PakfireProblem pakfire_request_get_problems(struct pakfire_request* request); -PakfireTransaction pakfire_request_get_transaction(struct pakfire_request* request); +struct pakfire_transaction* pakfire_request_get_transaction(struct pakfire_request* request); int pakfire_request_install(struct pakfire_request* request, const char* what); int pakfire_request_install_package(struct pakfire_request* request, PakfirePackage package); diff --git a/src/libpakfire/include/pakfire/transaction.h b/src/libpakfire/include/pakfire/transaction.h index 4231db8c9..d437d7b08 100644 --- a/src/libpakfire/include/pakfire/transaction.h +++ b/src/libpakfire/include/pakfire/transaction.h @@ -21,23 +21,25 @@ #ifndef PAKFIRE_TRANSACTION_H #define PAKFIRE_TRANSACTION_H -#include +struct pakfire_transaction; -PakfireTransaction pakfire_transaction_ref(PakfireTransaction transaction); -PakfireTransaction pakfire_transaction_unref(PakfireTransaction transaction); +struct pakfire_transaction* pakfire_transaction_ref(struct pakfire_transaction* transaction); +struct pakfire_transaction* pakfire_transaction_unref(struct pakfire_transaction* transaction); -size_t pakfire_transaction_count(PakfireTransaction transaction); -char* pakfire_transaction_dump(PakfireTransaction transaction, size_t width); +size_t pakfire_transaction_count(struct pakfire_transaction* transaction); +char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t width); -int pakfire_transaction_run(PakfireTransaction transaction); +int pakfire_transaction_run(struct pakfire_transaction* transaction); -int pakfire_transaction_download(PakfireTransaction transaction); +int pakfire_transaction_download(struct pakfire_transaction* transaction); #ifdef PAKFIRE_PRIVATE #include -int pakfire_transaction_create(PakfireTransaction* transaction, Pakfire pakfire, Transaction* trans); +#include + +int pakfire_transaction_create(struct pakfire_transaction** transaction, Pakfire pakfire, Transaction* trans); #endif diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h index 550cb3297..9af95f987 100644 --- a/src/libpakfire/include/pakfire/types.h +++ b/src/libpakfire/include/pakfire/types.h @@ -38,7 +38,6 @@ typedef struct _PakfireRelationList* PakfireRelationList; typedef struct _PakfireRepo* PakfireRepo; typedef struct _PakfireSolution* PakfireSolution; typedef struct _PakfireStep* PakfireStep; -typedef struct _PakfireTransaction* PakfireTransaction; typedef void (*pakfire_log_function_t)(int priority, const char* file, int line, const char* fn, diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c index 38d95ac02..0f3f1bb77 100644 --- a/src/libpakfire/request.c +++ b/src/libpakfire/request.c @@ -223,11 +223,11 @@ PAKFIRE_EXPORT PakfireProblem pakfire_request_get_problems(struct pakfire_reques return ret; } -PAKFIRE_EXPORT PakfireTransaction pakfire_request_get_transaction(struct pakfire_request* request) { +PAKFIRE_EXPORT struct pakfire_transaction* pakfire_request_get_transaction(struct pakfire_request* request) { if (!request->transaction) return NULL; - PakfireTransaction transaction; + struct pakfire_transaction* transaction; int r = pakfire_transaction_create(&transaction, request->pakfire, request->transaction); if (r) return NULL; diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index ddffb01ea..945836038 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -36,7 +36,7 @@ #include #include -struct _PakfireTransaction { +struct pakfire_transaction { Pakfire pakfire; int nrefs; @@ -46,7 +46,7 @@ struct _PakfireTransaction { size_t num_steps; }; -static pakfire_step_type_t transaction_get_step_type(PakfireTransaction transaction, Id id) { +static pakfire_step_type_t transaction_get_step_type(struct pakfire_transaction* transaction, Id id) { int type = transaction_type(transaction->transaction, id, 0); // Translate solver types into our own types @@ -80,7 +80,7 @@ static pakfire_step_type_t transaction_get_step_type(PakfireTransaction transact } } -static void pakfire_transaction_free(PakfireTransaction transaction) { +static void pakfire_transaction_free(struct pakfire_transaction* transaction) { // Release all steps if (transaction->steps) { for (unsigned int i = 0; i < transaction->num_steps; i++) @@ -94,7 +94,7 @@ static void pakfire_transaction_free(PakfireTransaction transaction) { free(transaction); } -static int pakfire_transaction_add_step(PakfireTransaction transaction, Id id) { +static int pakfire_transaction_add_step(struct pakfire_transaction* transaction, Id id) { int type = transaction_get_step_type(transaction, id); // Do not add ignored steps @@ -128,9 +128,9 @@ ERROR: return r; } -int pakfire_transaction_create(PakfireTransaction* transaction, +int pakfire_transaction_create(struct pakfire_transaction** transaction, Pakfire pakfire, Transaction* trans) { - PakfireTransaction t = calloc(1, sizeof(*t)); + struct pakfire_transaction* t = calloc(1, sizeof(*t)); if (!t) return ENOMEM; @@ -164,13 +164,13 @@ ERROR: return 1; } -PAKFIRE_EXPORT PakfireTransaction pakfire_transaction_ref(PakfireTransaction transaction) { +PAKFIRE_EXPORT struct pakfire_transaction* pakfire_transaction_ref(struct pakfire_transaction* transaction) { transaction->nrefs++; return transaction; } -PAKFIRE_EXPORT PakfireTransaction pakfire_transaction_unref(PakfireTransaction transaction) { +PAKFIRE_EXPORT struct pakfire_transaction* pakfire_transaction_unref(struct pakfire_transaction* transaction) { if (--transaction->nrefs > 0) return transaction; @@ -178,18 +178,18 @@ PAKFIRE_EXPORT PakfireTransaction pakfire_transaction_unref(PakfireTransaction t return NULL; } -PAKFIRE_EXPORT size_t pakfire_transaction_count(PakfireTransaction transaction) { +PAKFIRE_EXPORT size_t pakfire_transaction_count(struct pakfire_transaction* transaction) { return transaction->num_steps; } -static ssize_t pakfire_transaction_installsizechange(PakfireTransaction transaction) { +static ssize_t pakfire_transaction_installsizechange(struct pakfire_transaction* transaction) { ssize_t sizechange = transaction_calc_installsizechange(transaction->transaction); // Convert from kbytes to bytes return sizechange * 1024; } -PAKFIRE_EXPORT ssize_t pakfire_transaction_downloadsize(PakfireTransaction transaction) { +PAKFIRE_EXPORT ssize_t pakfire_transaction_downloadsize(struct pakfire_transaction* transaction) { ssize_t size = 0; for (unsigned int i = 0; i < transaction->num_steps; i++) @@ -254,7 +254,7 @@ static void pakfire_transaction_add_usage_line(char** str, size_t width, const c asprintf(str, "%s%-21s: %s\n", *str, headline, buffer); } -PAKFIRE_EXPORT char* pakfire_transaction_dump(PakfireTransaction transaction, size_t width) { +PAKFIRE_EXPORT char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t width) { char headline[1024]; char* string = ""; @@ -425,7 +425,7 @@ PAKFIRE_EXPORT char* pakfire_transaction_dump(PakfireTransaction transaction, si return string; } -static int pakfire_transaction_run_steps(PakfireTransaction transaction, +static int pakfire_transaction_run_steps(struct pakfire_transaction* transaction, struct pakfire_db* db, const pakfire_action_type_t action) { int r = 0; @@ -446,7 +446,7 @@ static int pakfire_transaction_run_steps(PakfireTransaction transaction, return r; } -PAKFIRE_EXPORT int pakfire_transaction_run(PakfireTransaction transaction) { +PAKFIRE_EXPORT int pakfire_transaction_run(struct pakfire_transaction* transaction) { struct pakfire_db* db; int r; @@ -487,7 +487,7 @@ ERROR: return r; } -static int pakfire_transaction_download_package(PakfireTransaction transaction, +static int pakfire_transaction_download_package(struct pakfire_transaction* transaction, struct pakfire_downloader* downloader, PakfirePackage pkg) { int r = 1; PakfireRepo repo = NULL; @@ -531,7 +531,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_transaction_download(PakfireTransaction transaction) { +PAKFIRE_EXPORT int pakfire_transaction_download(struct pakfire_transaction* transaction) { struct pakfire_downloader* downloader; int r;