includes: merge common and utils

joelguittet · May 25, 2023 · c73cd8b · c73cd8b
1 parent b0f6ee5
commit c73cd8b
Show file tree

Hide file tree

Showing 19 changed files with 54 additions and 106 deletions.
diff --git a/add-ons/src/mender-configure.c b/add-ons/src/mender-configure.c
@@ -30,7 +30,6 @@
 #include "mender-log.h"
 #include "mender-rtos.h"
 #include "mender-storage.h"
-#include "mender-utils.h"
 
 #ifdef CONFIG_MENDER_CLIENT_ADD_ON_CONFIGURE
 

diff --git a/add-ons/src/mender-inventory.c b/add-ons/src/mender-inventory.c
@@ -29,7 +29,6 @@
 #include "mender-inventory.h"
 #include "mender-log.h"
 #include "mender-rtos.h"
-#include "mender-utils.h"
 
 #ifdef CONFIG_MENDER_CLIENT_ADD_ON_INVENTORY
 

diff --git a/core/src/mender-api.c b/core/src/mender-api.c
@@ -25,13 +25,11 @@
  * SOFTWARE.
  */
 
-#include <cJSON.h>
 #include "mender-api.h"
 #include "mender-artifact.h"
 #include "mender-http.h"
 #include "mender-log.h"
 #include "mender-tls.h"
-#include "mender-utils.h"
 
 /**
  * @brief Paths of the mender-server APIs

diff --git a/core/src/mender-artifact.c b/core/src/mender-artifact.c
@@ -25,10 +25,8 @@
  * SOFTWARE.
  */
 
-#include <cJSON.h>
 #include "mender-artifact.h"
 #include "mender-log.h"
-#include "mender-utils.h"
 
 /**
  * @brief TAR block size

diff --git a/core/src/mender-client.c b/core/src/mender-client.c
@@ -25,14 +25,12 @@
  * SOFTWARE.
  */
 
-#include <cJSON.h>
 #include "mender-api.h"
 #include "mender-client.h"
 #include "mender-log.h"
 #include "mender-rtos.h"
 #include "mender-storage.h"
 #include "mender-tls.h"
-#include "mender-utils.h"
 
 /**
  * @brief Default host

diff --git a/core/src/mender-utils.c b/core/src/mender-utils.c
@@ -25,9 +25,7 @@
  * SOFTWARE.
  */
 
-#include <cJSON.h>
 #include "mender-log.h"
-#include "mender-utils.h"
 
 char *
 mender_utils_http_status_to_string(int status) {

diff --git a/include/mender-api.h b/include/mender-api.h
@@ -32,8 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <cJSON.h>
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Mender API configuration

diff --git a/include/mender-artifact.h b/include/mender-artifact.h
@@ -32,8 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <cJSON.h>
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Artifact state machine used to process input data stream

diff --git a/include/mender-client.h b/include/mender-client.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Mender client configuration

diff --git a/include/mender-common.h b/include/mender-common.h
diff --git a/include/mender-configure.h b/include/mender-configure.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 #ifdef CONFIG_MENDER_CLIENT_ADD_ON_CONFIGURE
 

diff --git a/include/mender-http.h b/include/mender-http.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Mender HTTP configuration

diff --git a/include/mender-inventory.h b/include/mender-inventory.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 #ifdef CONFIG_MENDER_CLIENT_ADD_ON_INVENTORY
 

diff --git a/include/mender-log.h b/include/mender-log.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Mender log levels

diff --git a/include/mender-ota.h b/include/mender-ota.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Begin new OTA deployment

diff --git a/include/mender-rtos.h b/include/mender-rtos.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Work parameters

diff --git a/include/mender-storage.h b/include/mender-storage.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Initialize mender storage

diff --git a/include/mender-tls.h b/include/mender-tls.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include "mender-utils.h"
 
 /**
  * @brief Initialize mender TLS

diff --git a/include/mender-utils.h b/include/mender-utils.h
@@ -32,7 +32,49 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "mender-common.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <cJSON.h>
+
+/**
+ * @brief Mender error codes
+ */
+typedef enum {
+    MENDER_DONE      = 1,  /**< Done */
+    MENDER_OK        = 0,  /**< OK */
+    MENDER_FAIL      = -1, /**< Failure */
+    MENDER_NOT_FOUND = -2, /**< Not found */
+} mender_err_t;
+
+/**
+ * @brief Deployment status
+ */
+typedef enum {
+    MENDER_DEPLOYMENT_STATUS_DOWNLOADING,      /**< Status is "downloading" */
+    MENDER_DEPLOYMENT_STATUS_INSTALLING,       /**< Status is "installing" */
+    MENDER_DEPLOYMENT_STATUS_REBOOTING,        /**< Status is "rebooting" */
+    MENDER_DEPLOYMENT_STATUS_SUCCESS,          /**< Status is "success" */
+    MENDER_DEPLOYMENT_STATUS_FAILURE,          /**< Status is "failure" */
+    MENDER_DEPLOYMENT_STATUS_ALREADY_INSTALLED /**< Status is "already installed" */
+} mender_deployment_status_t;
+
+/**
+ * @brief Key-store item
+ */
+typedef struct {
+    char *name;  /**< Name of the item */
+    char *value; /**< Value of the item */
+} mender_keystore_item_t;
+
+/**
+ * @brief Key-store
+ */
+typedef mender_keystore_item_t mender_keystore_t;
 
 /**
  * @brief Function used to print HTTP status as string