From: Michael Tremer Date: Tue, 6 Apr 2021 16:07:14 +0000 (+0000) Subject: util: Move pakfire_action_type_string to steps X-Git-Tag: 0.9.28~1285^2~426 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6565d33dec4925a7adc0518b2754957f76710bac;p=pakfire.git util: Move pakfire_action_type_string to steps Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h index d6522ecd2..9e6c2d44b 100644 --- a/src/libpakfire/include/pakfire/util.h +++ b/src/libpakfire/include/pakfire/util.h @@ -46,8 +46,6 @@ int pakfire_access(Pakfire pakfire, const char* dir, const char* file, int mode) char* pakfire_sgets(char* str, int num, char** input); char* pakfire_remove_trailing_newline(char* str); -const char* pakfire_action_type_string(pakfire_action_type_t type); - int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len); size_t pakfire_string_to_size(const char* s); diff --git a/src/libpakfire/step.c b/src/libpakfire/step.c index 3a6f8bb20..b8682bd84 100644 --- a/src/libpakfire/step.c +++ b/src/libpakfire/step.c @@ -308,6 +308,28 @@ static int pakfire_step_erase(PakfireStep step) { return 0; // TODO } + +static const char* pakfire_action_type_string(pakfire_action_type_t type) { + switch (type) { + case PAKFIRE_ACTION_NOOP: + return "NOOP"; + + case PAKFIRE_ACTION_VERIFY: + return "VERIFY"; + + case PAKFIRE_ACTION_EXECUTE: + return "EXECUTE"; + + case PAKFIRE_ACTION_PRETRANS: + return "PRETRANS"; + + case PAKFIRE_ACTION_POSTTRANS: + return "POSTTRANS"; + } + + return NULL; +} + PAKFIRE_EXPORT int pakfire_step_run(PakfireStep step, struct pakfire_db* db, const pakfire_action_type_t action) { DEBUG(step->pakfire, "Running Step %p (%s)\n", step, pakfire_action_type_string(action)); diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index f8dc415ed..e80520b69 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -362,27 +362,6 @@ char* pakfire_remove_trailing_newline(char* str) { return str; } -PAKFIRE_EXPORT const char* pakfire_action_type_string(pakfire_action_type_t type) { - switch (type) { - case PAKFIRE_ACTION_NOOP: - return "NOOP"; - - case PAKFIRE_ACTION_VERIFY: - return "VERIFY"; - - case PAKFIRE_ACTION_EXECUTE: - return "EXECUTE"; - - case PAKFIRE_ACTION_PRETRANS: - return "PRETRANS"; - - case PAKFIRE_ACTION_POSTTRANS: - return "POSTTRANS"; - } - - return NULL; -} - PAKFIRE_EXPORT int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len) { if (!f) return -EBADF;