diff mbox series

[5/9] Factorize handling of state

Message ID 20180906114041.21828-5-sbabic@denx.de
State Accepted
Headers show
Series [1/9] Use provided macro for exit() | expand

Commit Message

Stefano Babic Sept. 6, 2018, 11:40 a.m. UTC 
A state is set just in case suricatta is running.
However, this is a general feature and can be factorized.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 bootloader/ebg.c                |  2 +-
 core/Makefile                   |  1 +
 {suricatta => core}/state.c     |  2 +-
 include/{suricatta => }/state.h |  1 -
 include/suricatta/suricatta.h   | 13 -------------
 include/util.h                  | 13 +++++++++++++
 suricatta/Makefile              |  2 +-
 suricatta/server_hawkbit.c      |  2 +-
 suricatta/server_hawkbit.h      |  2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)
 rename {suricatta => core}/state.c (98%)
 rename include/{suricatta => }/state.h (97%)
diff mbox series

Patch

diff --git a/bootloader/ebg.c b/bootloader/ebg.c
index ab1c871..dd4387e 100644
--- a/bootloader/ebg.c
+++ b/bootloader/ebg.c
@@ -15,7 +15,7 @@ 
 #include <util.h>
 #include <efibootguard/ebgenv.h>
 #include <generated/autoconf.h>
-#include <suricatta/state.h>
+#include <state.h>
 #include "bootloader.h"
 
 #ifdef CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER
diff --git a/core/Makefile b/core/Makefile
index 1fe0d4c..2657c31 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -15,4 +15,5 @@  obj-y += swupdate.o \
 	 util.o \
 	 parser.o \
 	 pctl.o \
+	 state.o \
 	 syslog.o \
diff --git a/suricatta/state.c b/core/state.c
similarity index 98%
rename from suricatta/state.c
rename to core/state.c
index 36897b8..fab1eda 100644
--- a/suricatta/state.c
+++ b/core/state.c
@@ -11,7 +11,7 @@ 
 #include <errno.h>
 #include <util.h>
 #include <bootloader.h>
-#include "suricatta/state.h"
+#include <state.h>
 
 /*
  * This check is to avoid to corrupt the environment
diff --git a/include/suricatta/state.h b/include/state.h
similarity index 97%
rename from include/suricatta/state.h
rename to include/state.h
index 47d4471..80d4f55 100644
--- a/include/suricatta/state.h
+++ b/include/state.h
@@ -7,7 +7,6 @@ 
 
 #pragma once
 #include <stdbool.h>
-#include "suricatta.h"
 
 /* (Persistent) Update State Management Functions.
  *
diff --git a/include/suricatta/suricatta.h b/include/suricatta/suricatta.h
index 57bf46b..0efbfba 100644
--- a/include/suricatta/suricatta.h
+++ b/include/suricatta/suricatta.h
@@ -18,19 +18,6 @@ 
  * implementations are defined here.
  */
 
-typedef enum {
-	SERVER_OK,
-	SERVER_EERR,
-	SERVER_EBADMSG,
-	SERVER_EINIT,
-	SERVER_EACCES,
-	SERVER_EAGAIN,
-	SERVER_UPDATE_AVAILABLE,
-	SERVER_NO_UPDATE_AVAILABLE,
-	SERVER_UPDATE_CANCELED,
-	SERVER_ID_REQUESTED,
-} server_op_res_t;
-
 int start_suricatta(const char *cfgname, int argc, char *argv[]) __attribute__((noreturn));
 void suricatta_print_help(void);
 int suricatta_wait(int seconds);
diff --git a/include/util.h b/include/util.h
index d59668b..e14861a 100644
--- a/include/util.h
+++ b/include/util.h
@@ -20,6 +20,19 @@ 
 
 extern int loglevel;
 
+typedef enum {
+	SERVER_OK,
+	SERVER_EERR,
+	SERVER_EBADMSG,
+	SERVER_EINIT,
+	SERVER_EACCES,
+	SERVER_EAGAIN,
+	SERVER_UPDATE_AVAILABLE,
+	SERVER_NO_UPDATE_AVAILABLE,
+	SERVER_UPDATE_CANCELED,
+	SERVER_ID_REQUESTED,
+} server_op_res_t;
+
 /*
  * loglevel is used into TRACE / ERROR
  * for values > LASTLOGLEVEL, it is an encoded field 
diff --git a/suricatta/Makefile b/suricatta/Makefile
index 8bb15ad..3b8dfa7 100644
--- a/suricatta/Makefile
+++ b/suricatta/Makefile
@@ -1,7 +1,7 @@ 
 # Copyright (C) 2014-2018 Stefano Babic <sbabic@denx.de>
 #
 # SPDX-License-Identifier:     GPL-2.0-or-later
-lib-$(CONFIG_SURICATTA) += state.o suricatta.o
+lib-$(CONFIG_SURICATTA) += suricatta.o
 ifneq ($(CONFIG_SURICATTA_HAWKBIT),)
 lib-$(CONFIG_SURICATTA) += server_hawkbit.o
 endif
diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c
index b4e10df..ebcf7f1 100644
--- a/suricatta/server_hawkbit.c
+++ b/suricatta/server_hawkbit.c
@@ -23,7 +23,7 @@ 
 #include "parselib.h"
 #include "channel.h"
 #include "channel_curl.h"
-#include "suricatta/state.h"
+#include "state.h"
 #include "server_hawkbit.h"
 #include "parselib.h"
 #include "swupdate_settings.h"
diff --git a/suricatta/server_hawkbit.h b/suricatta/server_hawkbit.h
index e7cf3dc..cd66f0c 100644
--- a/suricatta/server_hawkbit.h
+++ b/suricatta/server_hawkbit.h
@@ -7,7 +7,7 @@ 
 
 #pragma once
 #include <stdbool.h>
-#include <suricatta/state.h>
+#include <state.h>
 #include <swupdate_dict.h>
 #include <channel.h>