Moved string and time constants to respective util files

Signed-off-by: Michael Engel <[email protected]>
eclipse-bluechi · Oct 14, 2024 · 0e8c2df · 0e8c2df
1 parent b8dd4de
commit 0e8c2df
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/libbluechi/common/protocol.h b/src/libbluechi/common/protocol.h
@@ -7,10 +7,7 @@
 
 #include <errno.h>
 
-/* Time constants */
-#define USEC_PER_SEC 1000000
-#define USEC_PER_MSEC 1000
-#define NSEC_PER_USEC 1000
+#include "time-util.h"
 
 /* Configuration defaults */
 #define BC_DEFAULT_PORT "842"
@@ -124,8 +121,3 @@ typedef enum UnitActiveState {
 
 const char *active_state_to_string(UnitActiveState s);
 UnitActiveState active_state_from_string(const char *s);
-
-/* Constants */
-#define SYMBOL_WILDCARD "*"
-#define SYMBOL_GLOB_ALL '*'
-#define SYMBOL_GLOB_ONE '?'
diff --git a/src/libbluechi/common/string-util.h b/src/libbluechi/common/string-util.h
@@ -9,7 +9,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "protocol.h"
+/* Constants */
+#define SYMBOL_WILDCARD "*"
+#define SYMBOL_GLOB_ALL '*'
+#define SYMBOL_GLOB_ONE '?'
 
 #define streq(a, b) (strcmp((a), (b)) == 0)
 #define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)

diff --git a/src/libbluechi/common/time-util.h b/src/libbluechi/common/time-util.h
@@ -10,6 +10,9 @@
 #include <stdlib.h>
 
 #define USEC_INFINITY UINT64_MAX
+#define USEC_PER_SEC 1000000
+#define USEC_PER_MSEC 1000
+#define NSEC_PER_USEC 1000
 
 static const uint64_t sec_to_microsec_multiplier = 1000000;
 static const double microsec_to_millisec_multiplier = 1e-3;

diff --git a/src/libbluechi/test/common/time-util/timespec_to_micros_test.c b/src/libbluechi/test/common/time-util/timespec_to_micros_test.c
@@ -8,7 +8,6 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "libbluechi/common/protocol.h"
 #include "libbluechi/common/time-util.h"
 
 int main() {