Divide private header files to include/private folder

Change-Id: Ib9fab5c41a35cfb70a8f198481386e00f3a1a182
Signed-off-by: TaeminYeom <taemin.yeom@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4964fb..d7fc8d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE(GNUInstallDirs)
 SET(VERSION ${FULLVER})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
-INCLUDE_DIRECTORIES(include ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(include include/private ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Build options
 FOREACH(flag ${${PROJECT_NAME}_CFLAGS})
@@ -26,4 +26,4 @@ ADD_SUBDIRECTORY(src/api)
 ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(tools)
 
-INSTALL(FILES include/sensor.h include/sensor-internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor)
+INSTALL(DIRECTORY include/ include/private/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor)

diff --git a/include/sensor_info_list.h b/include/private/sensor-info-private.h
similarity index 96%
rename from include/sensor_info_list.h
rename to include/private/sensor-info-private.h
index 99d6cd3..6963970 100644 (file)
--- a/include/sensor_info_list.h
+++ b/include/private/sensor-info-private.h
@@ -1,3 +1,8 @@
+#include <sensor.h>
+
+#ifndef _SENSOR_INFO_PRIVATE_H_
+#define _SENSOR_INFO_PRIVATE_H_
+
 #define SENSOR_NUM (sizeof(sensor_info_lists) / sizeof(sensor_info_lists[0]))
 
 struct sensor_info_list {
@@ -39,3 +44,6 @@ static const struct sensor_info_list sensor_info_lists[] = {
        {SENSOR_HUMAN_SLEEP_MONITOR,         "Sleep monitor",                            "SLEEP_MONITOR",      1},
        {SENSOR_HUMAN_SLEEP_DETECTOR,        "Sleep detector",                           "SLEEP_DETECTOR",     1},
 };
+
+#endif /* _SENSOR_INFO_PRIVATE_H_ */
+

diff --git a/include/sensor-log.h b/include/private/sensor-log-private.h
similarity index 100%
rename from include/sensor-log.h
rename to include/private/sensor-log-private.h

diff --git a/include/sensor-private.h b/include/private/sensor-private.h
similarity index 100%
rename from include/sensor-private.h
rename to include/private/sensor-private.h

diff --git a/include/sensor-types.h b/include/private/sensor-types-private.h
similarity index 100%
rename from include/sensor-types.h
rename to include/private/sensor-types-private.h

diff --git a/include/sensor-internal.h b/include/sensor-internal.h
index bb32f54..8cd508a 100644 (file)
--- a/include/sensor-internal.h
+++ b/include/sensor-internal.h
@@ -26,8 +26,8 @@
 #include <limits.h>
 
 /*header for common sensor type*/
-#include <sensor-types.h>
 #include <sensor.h>
+#include <sensor-types-private.h>
 #include <hal-sensor-types.h>
 
 #define SENSOR_BATCH_LATENCY_DEFAULT UINT_MAX

diff --git a/packaging/capi-system-sensor.spec b/packaging/capi-system-sensor.spec
index dd07e40..2ac2408 100644 (file)
--- a/packaging/capi-system-sensor.spec
+++ b/packaging/capi-system-sensor.spec
@@ -108,6 +108,7 @@ find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';'
 %manifest packaging/capi-system-sensor.manifest
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/sensor/*.h
+%{_includedir}/sensor/private/*.h
 %{_libdir}/libcapi-system-sensor.so
 
 %files test

diff --git a/src/api/sensor-internal.cpp b/src/api/sensor-internal.cpp
index 8e764f1..35b20b5 100644 (file)
--- a/src/api/sensor-internal.cpp
+++ b/src/api/sensor-internal.cpp
@@ -18,14 +18,14 @@
 
 #include <sensor-internal.h>
 #include <sensor.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 #include <sensor_types_private.h>
 #include <sensor_utils.h>
 #include <channel_handler.h>
 #include <sensor_manager.h>
 #include <sensor_listener.h>
 #include <sensor_provider_internal.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include <cmutex.h>
 #include <command_types.h>
 #include "sensor_reader.h"

diff --git a/src/api/sensor.cpp b/src/api/sensor.cpp
index db1d8ec..76255e1 100644 (file)
--- a/src/api/sensor.cpp
+++ b/src/api/sensor.cpp
@@ -25,7 +25,7 @@
 #include <sensor.h>
 #include <sensor-internal.h>
 #include <sensor-private.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 
 #define RETURN_VAL_IF(expr, err) \
        do { \

diff --git a/src/api/sensor_listener.cpp b/src/api/sensor_listener.cpp
index c0953bf..3a45899 100644 (file)
--- a/src/api/sensor_listener.cpp
+++ b/src/api/sensor_listener.cpp
@@ -20,8 +20,8 @@
 #include "sensor_listener.h"
 
 #include <channel_handler.h>
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
 #include <command_types.h>
 #include <ipc_client.h>
 

diff --git a/src/api/sensor_listener.h b/src/api/sensor_listener.h
index 98b6787..6989c52 100644 (file)
--- a/src/api/sensor_listener.h
+++ b/src/api/sensor_listener.h
@@ -25,7 +25,7 @@
 #include <channel_handler.h>
 #include <event_loop.h>
 #include <sensor_info.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 #include <cmutex.h>
 #include <map>
 #include <atomic>

diff --git a/src/api/sensor_manager.cpp b/src/api/sensor_manager.cpp
index 89504f6..dee567a 100644 (file)
--- a/src/api/sensor_manager.cpp
+++ b/src/api/sensor_manager.cpp
@@ -19,7 +19,7 @@
 
 #include "sensor_manager.h"
 
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include <sensor_info.h>
 #include <sensor_utils.h>
 #include <command_types.h>

diff --git a/src/api/sensor_manager_channel_handler.cpp b/src/api/sensor_manager_channel_handler.cpp
index 32d5d44..223a67e 100644 (file)
--- a/src/api/sensor_manager_channel_handler.cpp
+++ b/src/api/sensor_manager_channel_handler.cpp
@@ -19,7 +19,7 @@
 
 #include "sensor_manager_channel_handler.h"
 
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include <command_types.h>
 #include "sensor_manager.h"
 

diff --git a/src/api/sensor_provider.cpp b/src/api/sensor_provider.cpp
index f590388..bcf8749 100644 (file)
--- a/src/api/sensor_provider.cpp
+++ b/src/api/sensor_provider.cpp
@@ -15,13 +15,12 @@
  */
 
 #include <sensor.h>
-#include <sensor-private.h>
 #include <sensor-internal.h>
+#include <sensor-private.h>
+#include <sensor-log-private.h>
 #include <new>
 #include <map>
 
-#include "include/sensor-log.h"
-
 #define RETV_IF(expr, val) \
        do { if (expr) { return (val); } } while (0)
 

diff --git a/src/api/sensor_provider_channel_handler.cpp b/src/api/sensor_provider_channel_handler.cpp
index c0aa88f..b464458 100644 (file)
--- a/src/api/sensor_provider_channel_handler.cpp
+++ b/src/api/sensor_provider_channel_handler.cpp
@@ -20,7 +20,7 @@
 #include "sensor_provider_channel_handler.h"
 
 #include <command_types.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include "sensor_provider_internal.h"
 
 using namespace sensor;

diff --git a/src/api/sensor_provider_internal.cpp b/src/api/sensor_provider_internal.cpp
index c0471d8..f3fccd3 100644 (file)
--- a/src/api/sensor_provider_internal.cpp
+++ b/src/api/sensor_provider_internal.cpp
@@ -21,8 +21,8 @@
 
 #include <message.h>
 #include <channel.h>
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
 #include <sensor_utils.h>
 #include <ipc_client.h>
 #include <command_types.h>

diff --git a/src/api/sensor_provider_internal.h b/src/api/sensor_provider_internal.h
index 66e14b1..f4bfa17 100644 (file)
--- a/src/api/sensor_provider_internal.h
+++ b/src/api/sensor_provider_internal.h
@@ -26,7 +26,7 @@
 #include <event_loop.h>
 #include <sensor-internal.h>
 #include <sensor_info.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 #include <map>
 #include <atomic>
 

diff --git a/src/api/sensor_reader.cpp b/src/api/sensor_reader.cpp
index ddfb0e9..aa0a5c9 100644 (file)
--- a/src/api/sensor_reader.cpp
+++ b/src/api/sensor_reader.cpp
@@ -19,8 +19,8 @@
 
 #include "sensor_reader.h"
 
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
 #include <chrono>
 
 using namespace sensor;

diff --git a/src/api/sensor_recorder/sensor_recorder.cpp b/src/api/sensor_recorder/sensor_recorder.cpp
index a20486b..115d1fa 100644 (file)
--- a/src/api/sensor_recorder/sensor_recorder.cpp
+++ b/src/api/sensor_recorder/sensor_recorder.cpp
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <sensor.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include <sensor_recorder_internal.h>
 #include <map>
 #include <string>

diff --git a/src/api/sensor_recorder/sensor_recorder_dummy.cpp b/src/api/sensor_recorder/sensor_recorder_dummy.cpp
index 6eadce3..0984489 100644 (file)
--- a/src/api/sensor_recorder/sensor_recorder_dummy.cpp
+++ b/src/api/sensor_recorder/sensor_recorder_dummy.cpp
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <sensor.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 
 int sensor_recorder_is_supported(sensor_type_e type, bool *supported)
 {

diff --git a/src/shared/accept_event_handler.cpp b/src/shared/accept_event_handler.cpp
index 2030abc..1ee14a8 100644 (file)
--- a/src/shared/accept_event_handler.cpp
+++ b/src/shared/accept_event_handler.cpp
@@ -19,7 +19,7 @@
 
 #include "accept_event_handler.h"
 
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 #include "ipc_server.h"
 
 using namespace ipc;

diff --git a/src/shared/cbase_lock.cpp b/src/shared/cbase_lock.cpp
index 02026f1..9cfac7f 100644 (file)
--- a/src/shared/cbase_lock.cpp
+++ b/src/shared/cbase_lock.cpp
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include <cbase_lock.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 
 using namespace sensor;
 

diff --git a/src/shared/channel.cpp b/src/shared/channel.cpp
index 11b1ba9..e8021cd 100644 (file)
--- a/src/shared/channel.cpp
+++ b/src/shared/channel.cpp
@@ -24,7 +24,7 @@
 #include <memory>
 #include <algorithm>
 
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 #include "channel_event_handler.h"
 
 #define SYSTEMD_SOCK_BUF_SIZE (128*1024)

diff --git a/src/shared/channel_event_handler.cpp b/src/shared/channel_event_handler.cpp
index 4d9ef07..aeba1c3 100644 (file)
--- a/src/shared/channel_event_handler.cpp
+++ b/src/shared/channel_event_handler.cpp
@@ -21,7 +21,7 @@
 
 #include "channel.h"
 #include "channel_handler.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 
 using namespace ipc;
 

diff --git a/src/shared/cmutex.cpp b/src/shared/cmutex.cpp
index 0ffc28d..df28253 100644 (file)
--- a/src/shared/cmutex.cpp
+++ b/src/shared/cmutex.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <cmutex.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 
 using namespace sensor;
 

diff --git a/src/shared/command_types.h b/src/shared/command_types.h
index 1e2218c..b5570c2 100644 (file)
--- a/src/shared/command_types.h
+++ b/src/shared/command_types.h
@@ -20,7 +20,7 @@
 #ifndef __COMMAND_TYPES_H__
 #define __COMMAND_TYPES_H__
 
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 #include "sensor_info.h"
 
 #define SENSOR_CHANNEL_PATH            "/run/.sensord.socket"

diff --git a/src/shared/event_loop.cpp b/src/shared/event_loop.cpp
index 6185ba2..218295f 100644 (file)
--- a/src/shared/event_loop.cpp
+++ b/src/shared/event_loop.cpp
@@ -30,7 +30,7 @@
 #include <queue>
 
 #include "channel_event_handler.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 #include "event_handler.h"
 #include "channel.h"
 

diff --git a/src/shared/ipc_client.cpp b/src/shared/ipc_client.cpp
index 5af2852..3d2365e 100644 (file)
--- a/src/shared/ipc_client.cpp
+++ b/src/shared/ipc_client.cpp
@@ -19,7 +19,7 @@
 
 #include "ipc_client.h"
 
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 #include "stream_socket.h"
 #include "event_handler.h"
 #include "channel_event_handler.h"

diff --git a/src/shared/ipc_server.cpp b/src/shared/ipc_server.cpp
index 9d204e8..c0eefe0 100644 (file)
--- a/src/shared/ipc_server.cpp
+++ b/src/shared/ipc_server.cpp
@@ -20,7 +20,7 @@
 #include "ipc_server.h"
 
 #include "channel.h"
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 #include "event_loop.h"
 #include "channel_event_handler.h"
 #include "accept_event_handler.h"

diff --git a/src/shared/message.cpp b/src/shared/message.cpp
index 8d4bbe6..e2cb495 100644 (file)
--- a/src/shared/message.cpp
+++ b/src/shared/message.cpp
@@ -19,7 +19,7 @@
 
 #include "message.h"
 
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include <atomic>
 
 using namespace ipc;

diff --git a/src/shared/sensor_info.cpp b/src/shared/sensor_info.cpp
index b6de3ff..39f73ec 100644 (file)
--- a/src/shared/sensor_info.cpp
+++ b/src/shared/sensor_info.cpp
@@ -19,9 +19,9 @@
 
 #include "sensor_info.h"
 
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 #include <sensor_types_private.h>
-#include <sensor-log.h>
+#include <sensor-log-private.h>
 #include <cfloat>
 #include <algorithm>
 #include <string>

diff --git a/src/shared/sensor_info.h b/src/shared/sensor_info.h
index dd816cd..e54d7d6 100644 (file)
--- a/src/shared/sensor_info.h
+++ b/src/shared/sensor_info.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 #include <hal/hal-sensor-types.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 
 namespace sensor {
 

diff --git a/src/shared/sensor_utils.cpp b/src/shared/sensor_utils.cpp
index 9bd178d..d86855f 100644 (file)
--- a/src/shared/sensor_utils.cpp
+++ b/src/shared/sensor_utils.cpp
@@ -28,8 +28,8 @@
 #include <stddef.h>
 #include <map>
 
-#include <sensor-log.h>
-#include <sensor-types.h>
+#include <sensor-log-private.h>
+#include <sensor-types-private.h>
 #include <sensor_types_private.h>
 
 #ifndef PATH_MAX

diff --git a/src/shared/sensor_utils.h b/src/shared/sensor_utils.h
index b5bd95a..932619b 100644 (file)
--- a/src/shared/sensor_utils.h
+++ b/src/shared/sensor_utils.h
@@ -21,7 +21,7 @@
 #define __SENSOR_UTILS_H__
 
 #include <time.h>
-#include <sensor-types.h>
+#include <sensor-types-private.h>
 #include <string>
 #include <vector>
 

diff --git a/src/shared/seqpacket_socket.cpp b/src/shared/seqpacket_socket.cpp
index cd0ea08..b7ad634 100644 (file)
--- a/src/shared/seqpacket_socket.cpp
+++ b/src/shared/seqpacket_socket.cpp
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 
 using namespace ipc;
 

diff --git a/src/shared/socket.cpp b/src/shared/socket.cpp
index bbf4c8d..c47cd2b 100644 (file)
--- a/src/shared/socket.cpp
+++ b/src/shared/socket.cpp
@@ -27,7 +27,7 @@
 #include <sys/ioctl.h>
 #include <systemd/sd-daemon.h>
 
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 
 #define SOCK_TIMEOUT 10
 

diff --git a/src/shared/stream_socket.cpp b/src/shared/stream_socket.cpp
index 18df444..eaaad0d 100644 (file)
--- a/src/shared/stream_socket.cpp
+++ b/src/shared/stream_socket.cpp
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "sensor-log.h"
+#include "sensor-log-private.h"
 
 #define SLEEP_10_MS usleep(10000)
 

diff --git a/tests/main.c b/tests/main.c
index eb334d5..08d5de1 100644 (file)
--- a/tests/main.c
+++ b/tests/main.c
@@ -26,7 +26,7 @@
 
 #include "spec_test.h"
 #include "stress_test.h"
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
 
 static void usage(void)
 {

diff --git a/tests/spec_test.c b/tests/spec_test.c
index ac4aea9..5d2850c 100644 (file)
--- a/tests/spec_test.c
+++ b/tests/spec_test.c
@@ -22,7 +22,7 @@
 #include <sensor.h>
 
 #include "spec_test.h"
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
 
 #define TEST_COUNT_ONE 100
 #define TEST_COUNT_ALL 1000

diff --git a/tests/stress_test.c b/tests/stress_test.c
index ee52617..da05b87 100644 (file)
--- a/tests/stress_test.c
+++ b/tests/stress_test.c
@@ -22,7 +22,7 @@
 #include <sensor.h>
 
 #include "stress_test.h"
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
 
 void sensor_events_callback(sensor_h sensor, sensor_event_s events[], int events_count, void *user_data)
 {
@@ -111,4 +111,4 @@ void stress_test(int type)
        }
 
        printf("Test was terminated with error.\n");
-}
\ No newline at end of file
+}

diff --git a/tools/sensor-tool.c b/tools/sensor-tool.c
index 06485f6..7f24230 100644 (file)
--- a/tools/sensor-tool.c
+++ b/tools/sensor-tool.c
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include <sensor.h>
 
-#include "sensor_info_list.h"
+#include "sensor-info-private.h"
 
 static GMainLoop *loop;
 static bool turned_on[40];