From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Jan 2018 17:25:40 +0000 (+0100)
Subject: libpakfire: Rename pakfire_action_type to pakfire_action_type_t
X-Git-Tag: 0.9.28~1285^2~1183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=968723723c20550790baf30d46c17a8559187fae;p=pakfire.git

libpakfire: Rename pakfire_action_type to pakfire_action_type_t

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

diff --git a/src/libpakfire/include/pakfire/step.h b/src/libpakfire/include/pakfire/step.h
index b42c6b576..03053cb4a 100644
--- a/src/libpakfire/include/pakfire/step.h
+++ b/src/libpakfire/include/pakfire/step.h
@@ -55,7 +55,7 @@ typedef enum _pakfire_script_types {
 	PAKFIRE_SCRIPT_POSTTRANSUP,
 } pakfire_script_type;
 
-int pakfire_step_run(PakfireStep step, pakfire_action_type action);
+int pakfire_step_run(PakfireStep step, pakfire_action_type_t action);
 
 #endif
 
diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h
index b5d6f17dd..86e92a74c 100644
--- a/src/libpakfire/include/pakfire/types.h
+++ b/src/libpakfire/include/pakfire/types.h
@@ -72,7 +72,7 @@ typedef enum _pakfire_action_types {
 	PAKFIRE_ACTION_EXECUTE   = 1 << 1,
 	PAKFIRE_ACTION_PRETRANS  = 1 << 2,
 	PAKFIRE_ACTION_POSTTRANS = 1 << 3,
-} pakfire_action_type;
+} pakfire_action_type_t;
 
 typedef enum _pakfire_step_types {
 	PAKFIRE_STEP_IGNORE = 0,
diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 3574ff999..b9318d59a 100644
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -25,6 +25,8 @@
 #include <sys/types.h>
 #include <time.h>
 
+#include <pakfire/types.h>
+
 void pakfire_oom(size_t num, size_t len);
 
 void* pakfire_malloc(size_t len);
@@ -48,6 +50,8 @@ int pakfire_mkdir(const char* path, mode_t 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);
+
 void init_libgcrypt();
 
 #endif /* PAKFIRE_UTIL_H */
diff --git a/src/libpakfire/step.c b/src/libpakfire/step.c
index 25a48ec80..3921286d0 100644
--- a/src/libpakfire/step.c
+++ b/src/libpakfire/step.c
@@ -243,8 +243,8 @@ static int pakfire_step_erase(PakfireStep step) {
 	return 0; // TODO
 }
 
-PAKFIRE_EXPORT int pakfire_step_run(PakfireStep step, const pakfire_action_type action) {
-	DEBUG("Running Step %p (%d)\n", step, action);
+PAKFIRE_EXPORT int pakfire_step_run(PakfireStep step, const pakfire_action_type_t action) {
+	DEBUG("Running Step %p (%s)\n", step, pakfire_action_type_string(action));
 
 	pakfire_step_type_t type = pakfire_step_get_type(step);
 
diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index b7cc29af9..406e1f700 100644
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -311,7 +311,7 @@ PAKFIRE_EXPORT char* pakfire_transaction_dump(PakfireTransaction transaction, si
 	return string;
 }
 
-static int pakfire_transaction_run_steps(PakfireTransaction transaction, const pakfire_action_type action) {
+static int pakfire_transaction_run_steps(PakfireTransaction transaction, const pakfire_action_type_t action) {
 	int r = 0;
 
 	// Walk through all steps
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 6f373ebb0..6b7c5218d 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -35,6 +35,7 @@
 #include <pakfire/constants.h>
 #include <pakfire/logging.h>
 #include <pakfire/private.h>
+#include <pakfire/types.h>
 
 void pakfire_oom(size_t num, size_t len) {
 	if (num)
@@ -253,3 +254,24 @@ void init_libgcrypt() {
 	// Tell libgcrypt that initialization has completed
 	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 }
+
+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;
+}