From 9ecc6b33ebcf5f7f4c289c9761bab100338fc918 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 14 Jan 2018 17:33:01 +0100 Subject: [PATCH] libpakfire: Rename pakfire_step_type to pakfire_step_type_t Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/step.h | 4 ++-- src/libpakfire/step.c | 8 ++++---- src/libpakfire/transaction.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libpakfire/include/pakfire/step.h b/src/libpakfire/include/pakfire/step.h index 7e659c4d8..6e7611e03 100644 --- a/src/libpakfire/include/pakfire/step.h +++ b/src/libpakfire/include/pakfire/step.h @@ -34,13 +34,13 @@ typedef enum _pakfire_step_types { PAKFIRE_STEP_UPGRADE, PAKFIRE_STEP_DOWNGRADE, PAKFIRE_STEP_OBSOLETE, -} pakfire_step_type; +} pakfire_step_type_t; PakfireStep pakfire_step_create(PakfireTransaction transaction, Id id); void pakfire_step_free(PakfireStep step); PakfirePackage pakfire_step_get_package(PakfireStep step); -pakfire_step_type pakfire_step_get_type(PakfireStep step); +pakfire_step_type_t pakfire_step_get_type(PakfireStep step); const char* pakfire_step_get_type_string(PakfireStep step); unsigned long long pakfire_step_get_downloadsize(PakfireStep step); diff --git a/src/libpakfire/step.c b/src/libpakfire/step.c index eb893c530..ed90cc5fd 100644 --- a/src/libpakfire/step.c +++ b/src/libpakfire/step.c @@ -54,7 +54,7 @@ PAKFIRE_EXPORT PakfirePackage pakfire_step_get_package(PakfireStep step) { return pakfire_package_create(step->pool, step->id); } -PAKFIRE_EXPORT pakfire_step_type pakfire_step_get_type(PakfireStep step) { +PAKFIRE_EXPORT pakfire_step_type_t pakfire_step_get_type(PakfireStep step) { Transaction* trans = pakfire_transaction_get_transaction(step->transaction); int type = transaction_type(trans, step->id, @@ -92,7 +92,7 @@ PAKFIRE_EXPORT pakfire_step_type pakfire_step_get_type(PakfireStep step) { } PAKFIRE_EXPORT const char* pakfire_step_get_type_string(PakfireStep step) { - pakfire_step_type type = pakfire_step_get_type(step); + pakfire_step_type_t type = pakfire_step_get_type(step); switch(type) { case PAKFIRE_STEP_INSTALL: @@ -155,7 +155,7 @@ PAKFIRE_EXPORT long pakfire_step_get_installsizechange(PakfireStep step) { PakfirePackage pkg = pakfire_step_get_package(step); int installsize = pakfire_package_get_installsize(pkg); - pakfire_step_type type = pakfire_step_get_type(step); + pakfire_step_type_t type = pakfire_step_get_type(step); switch (type) { case PAKFIRE_STEP_IGNORE: case PAKFIRE_STEP_ERASE: @@ -225,7 +225,7 @@ static int pakfire_step_erase(PakfireStep step) { } PAKFIRE_EXPORT int pakfire_step_run(PakfireStep step, const pakfire_action_type action) { - pakfire_step_type type = pakfire_step_get_type(step); + pakfire_step_type_t type = pakfire_step_get_type(step); // Get the package PakfirePackage pkg = pakfire_step_get_package(step); diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index 2f4823b86..3ab9d0b1f 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -206,7 +206,7 @@ static void pakfire_transaction_add_separator(char** str, size_t width) { } static size_t pakfire_transaction_add_section(char** str, size_t width, PakfireTransaction transaction, - const char* headline, pakfire_step_type type) { + const char* headline, pakfire_step_type_t type) { PakfirePackageList list = pakfire_transaction_get_packages(transaction, type); // Nothing to do if there are no packages in this stage -- 2.39.5