From 240c878a792befe42e19a7a7c92b34e19b83192d Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Wed, 12 Jul 2017 17:06:43 +0200
Subject: [PATCH] Rename callbacks to include http method
---
src/api/{encryption.c => encryption_get.c} | 2 +-
.../{encryption_init.c => encryption_init_post.c} | 2 +-
...{encryption_unlock.c => encryption_unlock_post.c} | 2 +-
src/cryptops-api.c | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
rename src/api/{encryption.c => encryption_get.c} (96%)
rename src/api/{encryption_init.c => encryption_init_post.c} (99%)
rename src/api/{encryption_unlock.c => encryption_unlock_post.c} (95%)
diff --git a/src/api/encryption.c b/src/api/encryption_get.c
similarity index 96%
rename from src/api/encryption.c
rename to src/api/encryption_get.c
index 0951f06..7805d97 100644
--- a/src/api/encryption.c
+++ b/src/api/encryption_get.c
@@ -10,7 +10,7 @@
* @param[in] user_data extra data to pass between main thread and callbacks
* @return internal status code
*/
-int callback_encryption(const struct _u_request * request,
+int callback_encryption_get(const struct _u_request * request,
struct _u_response * response, void * user_data)
{
bool encrypted;
diff --git a/src/api/encryption_init.c b/src/api/encryption_init_post.c
similarity index 99%
rename from src/api/encryption_init.c
rename to src/api/encryption_init_post.c
index 92d1d0f..5503deb 100644
--- a/src/api/encryption_init.c
+++ b/src/api/encryption_init_post.c
@@ -27,7 +27,7 @@
* @param[in] user_data extra data to pass between handler and main thread
* @return internal status code
*/
-int callback_encryption_init(const struct _u_request * request,
+int callback_encryption_init_post(const struct _u_request * request,
struct _u_response * response, void * user_data)
{
bool * reboot = (bool *)user_data;
diff --git a/src/api/encryption_unlock.c b/src/api/encryption_unlock_post.c
similarity index 95%
rename from src/api/encryption_unlock.c
rename to src/api/encryption_unlock_post.c
index fd20287..8334083 100644
--- a/src/api/encryption_unlock.c
+++ b/src/api/encryption_unlock_post.c
@@ -6,7 +6,7 @@
* @param[in] user_data extra data to pass between main thread and callbacks
* @return internal status code
*/
-int callback_encryption_unlock(const struct _u_request * request,
+int callback_encryption_unlock_post(const struct _u_request * request,
struct _u_response * response, void * user_data)
{
json_t * json_input = ulfius_get_json_body_request(request, NULL);
diff --git a/src/cryptops-api.c b/src/cryptops-api.c
index 5a49efd..389f993 100644
--- a/src/cryptops-api.c
+++ b/src/cryptops-api.c
@@ -6,9 +6,9 @@
#include <auxiliary.c>
#include <encryption_functions.c>
#include <api/default.c>
-#include <api/encryption.c>
-#include <api/encryption_init.c>
-#include <api/encryption_unlock.c>
+#include <api/encryption_get.c>
+#include <api/encryption_init_post.c>
+#include <api/encryption_unlock_post.c>
#include <api/encryption_keys_put.c>
#include <api/ssh_keys_get.c>
@@ -40,13 +40,13 @@ int main(int argc, char ** argv)
bool reboot = false;
ulfius_add_endpoint_by_val(&instance, "GET" , PREFIX,
"/encryption",
- 0, &callback_encryption, NULL);
+ 0, &callback_encryption_get, NULL);
ulfius_add_endpoint_by_val(&instance, "POST", PREFIX,
"/encryption/init",
- 0, &callback_encryption_init, &reboot);
+ 0, &callback_encryption_init_post, &reboot);
ulfius_add_endpoint_by_val(&instance, "POST", PREFIX,
"/encryption/unlock",
- 0, &callback_encryption_unlock, NULL);
+ 0, &callback_encryption_unlock_post, NULL);
ulfius_add_endpoint_by_val(&instance, "PUT" , PREFIX,
"/encryption/keys/:slot",
0, &callback_encryption_keys_put, NULL);
--
GitLab