From 5083ca8509d3cb787d3f220b1956f61637e09642 Mon Sep 17 00:00:00 2001
From: Mateusz Majewski <m.majewski2@samsung.com>
Date: Fri, 4 Dec 2020 13:57:48 +0100
Subject: [PATCH] Move some headers into better places

Change-Id: Ib01dfeb49092e26eab27f9a3ca39d5ea82eb5013
---
 {include => src/libdlog}/deduplicate.h           | 0
 {include => src/libdlogutil}/fd_info.h           | 0
 {include => src/libdlogutil}/fdi_logger.h        | 0
 {include => src/libdlogutil}/fdi_pipe.h          | 1 -
 {include => src/libdlogutil}/fdi_pipe_internal.h | 1 -
 src/libdlogutil/lib.c                            | 3 ++-
 src/libdlogutil/logretrieve.c                    | 7 ++++---
 {include => src/libdlogutil}/logretrieve.h       | 3 ++-
 src/logctl/logctl.c                              | 3 ++-
 {include => src/logctl}/logctl.h                 | 1 -
 src/tests/deduplicate_test.c                     | 3 ++-
 src/tests/fd_info_wrap.c                         | 2 +-
 src/tests/fdi_logger_wrap.c                      | 2 +-
 src/tests/fdi_pipe_wrap.c                        | 6 +++---
 src/tests/logctl.c                               | 3 ++-
 src/tests/logutil.c                              | 2 +-
 src/tests/logutil_wrap.c                         | 2 +-
 17 files changed, 21 insertions(+), 18 deletions(-)
 rename {include => src/libdlog}/deduplicate.h (100%)
 rename {include => src/libdlogutil}/fd_info.h (100%)
 rename {include => src/libdlogutil}/fdi_logger.h (100%)
 rename {include => src/libdlogutil}/fdi_pipe.h (99%)
 rename {include => src/libdlogutil}/fdi_pipe_internal.h (99%)
 rename {include => src/libdlogutil}/logretrieve.h (98%)
 rename {include => src/logctl}/logctl.h (99%)

diff --git a/include/deduplicate.h b/src/libdlog/deduplicate.h
similarity index 100%
rename from include/deduplicate.h
rename to src/libdlog/deduplicate.h
diff --git a/include/fd_info.h b/src/libdlogutil/fd_info.h
similarity index 100%
rename from include/fd_info.h
rename to src/libdlogutil/fd_info.h
diff --git a/include/fdi_logger.h b/src/libdlogutil/fdi_logger.h
similarity index 100%
rename from include/fdi_logger.h
rename to src/libdlogutil/fdi_logger.h
diff --git a/include/fdi_pipe.h b/src/libdlogutil/fdi_pipe.h
similarity index 99%
rename from include/fdi_pipe.h
rename to src/libdlogutil/fdi_pipe.h
index 8b67896..998fb2a 100644
--- a/include/fdi_pipe.h
+++ b/src/libdlogutil/fdi_pipe.h
@@ -25,4 +25,3 @@
 #include "fd_info.h"
 
 extern const struct fd_ops ops_pipe;
-
diff --git a/include/fdi_pipe_internal.h b/src/libdlogutil/fdi_pipe_internal.h
similarity index 99%
rename from include/fdi_pipe_internal.h
rename to src/libdlogutil/fdi_pipe_internal.h
index 0b5e35e..f85edbf 100644
--- a/include/fdi_pipe_internal.h
+++ b/src/libdlogutil/fdi_pipe_internal.h
@@ -9,4 +9,3 @@ struct pipe_priv_data {
 	int sock_fd;
 	bool eof;
 };
-
diff --git a/src/libdlogutil/lib.c b/src/libdlogutil/lib.c
index eabb12f..9359674 100644
--- a/src/libdlogutil/lib.c
+++ b/src/libdlogutil/lib.c
@@ -21,10 +21,11 @@
  * THE SOFTWARE. */
 
 #include <dlogutil-internal.h>
-#include <logretrieve.h>
 #include <tizen.h>
 #include <logcommon.h>
 
+#include "logretrieve.h"
+
 EXPORT_API dlogutil_config_s *dlogutil_config_create(void)
 {
 	dlogutil_config_s *ret = calloc(1, sizeof(*ret));
diff --git a/src/libdlogutil/logretrieve.c b/src/libdlogutil/logretrieve.c
index d44336c..602ce8c 100644
--- a/src/libdlogutil/logretrieve.c
+++ b/src/libdlogutil/logretrieve.c
@@ -22,11 +22,12 @@
 
 // DLog
 #include <dlogutil-internal.h>
-#include <fdi_pipe.h>
-#include <fdi_logger.h>
-#include <logretrieve.h>
 #include <queued_entry_timestamp.h>
 
+#include "fdi_pipe.h"
+#include "fdi_logger.h"
+#include "logretrieve.h"
+
 // C
 #include <limits.h>
 
diff --git a/include/logretrieve.h b/src/libdlogutil/logretrieve.h
similarity index 98%
rename from include/logretrieve.h
rename to src/libdlogutil/logretrieve.h
index 3a07fb5..4e167a8 100644
--- a/include/logretrieve.h
+++ b/src/libdlogutil/logretrieve.h
@@ -25,10 +25,11 @@
 #include <sys/epoll.h>
 
 #include <dlogutil-internal.h>
-#include <fd_info.h>
 #include <logconfig.h>
 #include <sort_vector.h>
 
+#include "fd_info.h"
+
 typedef struct dlogutil_state {
 	struct sort_vector logs;
 	struct fd_info **data_fds;
diff --git a/src/logctl/logctl.c b/src/logctl/logctl.c
index eb8893b..9c14d95 100644
--- a/src/logctl/logctl.c
+++ b/src/logctl/logctl.c
@@ -16,9 +16,10 @@
 #include <dynamic_config.h>
 #include <logcommon.h>
 #include <logconfig.h>
-#include <logctl.h>
 #include <loglimiter.h>
 
+#include "logctl.h"
+
 bool parse_options(int argc, const char **argv, struct parsed_params *params, int *exit_value)
 {
 	assert(argv);
diff --git a/include/logctl.h b/src/logctl/logctl.h
similarity index 99%
rename from include/logctl.h
rename to src/logctl/logctl.h
index 0f0fed8..efb3f47 100644
--- a/include/logctl.h
+++ b/src/logctl/logctl.h
@@ -38,4 +38,3 @@ int copy_file_with_exceptions(const char *config_path, const struct keys_values
 int handle_set(const struct parsed_params *params, const char *config_path, struct log_config *conf);
 int handle_plog(const struct parsed_params *params, const char *config_path, struct log_config *conf);
 int handle_clear(const struct parsed_params *params, const char *config_path, struct log_config *conf);
-
diff --git a/src/tests/deduplicate_test.c b/src/tests/deduplicate_test.c
index 2c2a5cd..0c3abfb 100644
--- a/src/tests/deduplicate_test.c
+++ b/src/tests/deduplicate_test.c
@@ -25,11 +25,12 @@
 #include <pthread.h>
 
 // DLog
-#include "deduplicate.h"
 #include "hash.h"
 #include "libdlog.h"
 #include "logconfig.h"
 
+#include "../libdlog/deduplicate.h"
+
 #define DEDUPLICATE 0
 #define WARN 0xBA5EBALL
 #define PRINT 0xC0FFEE
diff --git a/src/tests/fd_info_wrap.c b/src/tests/fd_info_wrap.c
index a760436..5d43b6e 100644
--- a/src/tests/fd_info_wrap.c
+++ b/src/tests/fd_info_wrap.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 
 // DLog
-#include <fd_info.h>
+#include "../libdlogutil/fd_info.h"
 
 static bool use_real_free;
 static void *expect_free1, *expect_free2;
diff --git a/src/tests/fdi_logger_wrap.c b/src/tests/fdi_logger_wrap.c
index aed6a3f..e4951b7 100644
--- a/src/tests/fdi_logger_wrap.c
+++ b/src/tests/fdi_logger_wrap.c
@@ -19,7 +19,7 @@
 
 // DLog
 #include <dlog_ioctl.h>
-#include <fdi_logger.h>
+#include "../libdlogutil/fdi_logger.h"
 
 static int open_buf_ret;
 static const char *open_buf_path;
diff --git a/src/tests/fdi_pipe_wrap.c b/src/tests/fdi_pipe_wrap.c
index c53d1ae..b6217b8 100644
--- a/src/tests/fdi_pipe_wrap.c
+++ b/src/tests/fdi_pipe_wrap.c
@@ -15,9 +15,9 @@
  */
 
 #include <dlogutil-internal.h>
-#include <fd_info.h>
-#include <fdi_pipe.h>
-#include <fdi_pipe_internal.h>
+#include "../libdlogutil/fd_info.h"
+#include "../libdlogutil/fdi_pipe.h"
+#include "../libdlogutil/fdi_pipe_internal.h"
 #include <logpipe.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/src/tests/logctl.c b/src/tests/logctl.c
index 559bba4..56b23c1 100644
--- a/src/tests/logctl.c
+++ b/src/tests/logctl.c
@@ -4,7 +4,8 @@
 
 // DLog
 #include <logcommon.h>
-#include <logctl.h>
+
+#include "../logctl/logctl.h"
 
 static bool fail_calloc = false;
 extern void *__real_calloc(size_t nmemb, size_t size);
diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index 7b99ca2..991ff49 100644
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -4,7 +4,7 @@
 #include <log_file.h>
 #include <dlog-internal.h>
 #include <sort_vector.h>
-#include <fd_info.h>
+#include "../libdlogutil/fd_info.h"
 
 bool process_log(const dlogutil_entry_s *e, struct timespec reference_ts, dlogutil_sorting_order_e stamp_type, long timeout, int *callback_ret);
 struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, dlogutil_sorting_order_e sort_by);
diff --git a/src/tests/logutil_wrap.c b/src/tests/logutil_wrap.c
index 5793b9a..114aab7 100644
--- a/src/tests/logutil_wrap.c
+++ b/src/tests/logutil_wrap.c
@@ -20,7 +20,7 @@
 #include <log_file.h>
 #include <dlog-internal.h>
 #include <sort_vector.h>
-#include <fd_info.h>
+#include "../libdlogutil/fd_info.h"
 
 bool process_log(const dlogutil_entry_s *e, struct timespec reference_ts, dlogutil_sorting_order_e stamp_type, long timeout, int *callback_ret);
 struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, dlogutil_sorting_order_e sort_by);
-- 
2.7.4