From 4442741654b1fc7771597ebd7a0668b4b78eead6 Mon Sep 17 00:00:00 2001
From: Michael Engel <mengel@redhat.com>
Date: Fri, 11 Oct 2024 15:30:57 +0200
Subject: [PATCH] Moved string and time constants to respective util files

Signed-off-by: Michael Engel <mengel@redhat.com>
---
 src/libbluechi/common/protocol.h                       | 10 +---------
 src/libbluechi/common/string-util.h                    |  5 ++++-
 src/libbluechi/common/time-util.h                      |  3 +++
 .../test/common/time-util/timespec_to_micros_test.c    |  1 -
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/libbluechi/common/protocol.h b/src/libbluechi/common/protocol.h
index 01f0fc4825..e540b00f80 100644
--- 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
index 005cffd623..53cdf08c7a 100644
--- 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
index 164ee1e097..28f626ec93 100644
--- 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
index c04de8ec0b..aa7567b9b1 100644
--- 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() {