plugin-api: Change the header including style and remove duplicate common.h

In order to specify the path of header file, change the header including
style as following and the remove the duplicated common.h including log
macro.

- Before header including style
  #include "syscommon-plugin-common.h"
  #include "syscommon-plugin-common-interface.h"

- After header including style
  #include <system/syscommon-plugin-common.h>
  #include <system/syscommon-plugin-common-interface.h>

Change-Id: I723114be26e7891661dcc7ac02fd7d1ceb8dc0a1
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/plugin-api/common/CMakeLists.txt b/src/plugin-api/common/CMakeLists.txt
index 666d51f..d6eea2b 100644 (file)
--- a/src/plugin-api/common/CMakeLists.txt
+++ b/src/plugin-api/common/CMakeLists.txt
@@ -47,7 +47,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_LDFLAGS}
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/system/
        DESTINATION ${INCLUDEDIR}
        FILES_MATCHING PATTERN "*.h")
 

diff --git a/src/plugin-api/common/include/syscommon-plugin-common-interface.h b/src/plugin-api/common/include/system/syscommon-plugin-common-interface.h
similarity index 100%
rename from src/plugin-api/common/include/syscommon-plugin-common-interface.h
rename to src/plugin-api/common/include/system/syscommon-plugin-common-interface.h

diff --git a/src/plugin-api/common/include/syscommon-plugin-common.h b/src/plugin-api/common/include/system/syscommon-plugin-common.h
similarity index 100%
rename from src/plugin-api/common/include/syscommon-plugin-common.h
rename to src/plugin-api/common/include/system/syscommon-plugin-common.h

diff --git a/src/plugin-api/common/src/common.h b/src/plugin-api/common/src/common.h
index a89fe09..44e99fd 100644 (file)
--- a/src/plugin-api/common/src/common.h
+++ b/src/plugin-api/common/src/common.h
@@ -27,7 +27,7 @@
 
 #include <stdbool.h>
 
-#include "syscommon-plugin-common.h"
+#include <system/syscommon-plugin-common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/plugin-api/common/src/syscommon-plugin-api-conf.c b/src/plugin-api/common/src/syscommon-plugin-api-conf.c
index 19daa1a..0525b0a 100644 (file)
--- a/src/plugin-api/common/src/syscommon-plugin-api-conf.c
+++ b/src/plugin-api/common/src/syscommon-plugin-api-conf.c
@@ -27,8 +27,8 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 
-#include "syscommon-plugin-common.h"
-#include "syscommon-plugin-common-interface.h"
+#include <system/syscommon-plugin-common.h>
+#include <system/syscommon-plugin-common-interface.h>
 
 #include "common.h"
 #include "syscommon-plugin-api-conf.h"

diff --git a/src/plugin-api/common/src/syscommon-plugin-api-conf.h b/src/plugin-api/common/src/syscommon-plugin-api-conf.h
index 20e8b32..17dbbe8 100644 (file)
--- a/src/plugin-api/common/src/syscommon-plugin-api-conf.h
+++ b/src/plugin-api/common/src/syscommon-plugin-api-conf.h
@@ -28,7 +28,7 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 
-#include "syscommon-plugin-common-interface.h"
+#include <system/syscommon-plugin-common-interface.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/plugin-api/common/src/syscommon-plugin-api-list.h b/src/plugin-api/common/src/syscommon-plugin-api-list.h
index 29562d1..9271370 100644 (file)
--- a/src/plugin-api/common/src/syscommon-plugin-api-list.h
+++ b/src/plugin-api/common/src/syscommon-plugin-api-list.h
@@ -25,7 +25,7 @@
 #ifndef __SYSCOMMON_PLUGIN_API_LIST_H__
 #define __SYSCOMMON_PLUGIN_API_LIST_H__
 
-#include "syscommon-plugin-common.h"
+#include <system/syscommon-plugin-common.h>
 
 #include "common.h"
 

diff --git a/src/plugin-api/deviced/CMakeLists.txt b/src/plugin-api/deviced/CMakeLists.txt
index 644c594..c51dce5 100644 (file)
--- a/src/plugin-api/deviced/CMakeLists.txt
+++ b/src/plugin-api/deviced/CMakeLists.txt
@@ -53,7 +53,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${PLUGIN_API_DEVICED_VE
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PLUGIN_API_DEVICED_MAJORVER})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/system/
        DESTINATION ${INCLUDEDIR}
        FILES_MATCHING PATTERN "*.h"
 )

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-battery-interface.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery-interface.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-battery-interface.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery-interface.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-battery.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-battery.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-battery.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-common-interface.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-common-interface.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-common-interface.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-common-interface.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-display-interface.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display-interface.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-display-interface.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display-interface.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-display.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h
similarity index 93%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-display.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h
index 1e7a034..d284e62 100644 (file)
--- a/src/plugin-api/deviced/include/syscommon-plugin-deviced-display.h
+++ b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-display.h
@@ -29,8 +29,8 @@
 extern "C" {
 #endif
 
-#include "syscommon-plugin-deviced-common-interface.h"
-#include "syscommon-plugin-deviced-display-interface.h"
+#include <system/syscommon-plugin-deviced-common-interface.h>
+#include <system/syscommon-plugin-deviced-display-interface.h>
 
 /**
  * @brief Get the backend data of deviced-display module

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-input-interface.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-input-interface.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-input-interface.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-input-interface.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-input.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-input.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-input.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-input.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-power-interface.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-power-interface.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-power-interface.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-power-interface.h

diff --git a/src/plugin-api/deviced/include/syscommon-plugin-deviced-power.h b/src/plugin-api/deviced/include/system/syscommon-plugin-deviced-power.h
similarity index 100%
rename from src/plugin-api/deviced/include/syscommon-plugin-deviced-power.h
rename to src/plugin-api/deviced/include/system/syscommon-plugin-deviced-power.h

diff --git a/src/plugin-api/deviced/src/common.h b/src/plugin-api/deviced/src/common.h
deleted file mode 100644 (file)
index 236c616..0000000
--- a/src/plugin-api/deviced/src/common.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef __COMMON_H__
-#define __COMMON_H__
-
-#ifdef ENABLE_DLOG
-#include <dlog.h>
-
-#define _D(fmt, args...) SLOGD(fmt, ##args)
-#define _I(fmt, args...) SLOGI(fmt, ##args)
-#define _W(fmt, args...) SLOGW(fmt, ##args)
-#define _E(fmt, args...) SLOGE(fmt, ##args)
-#else
-#define _D(fmt, args...) do { } while(0)
-#define _I(fmt, args...) do { } while(0)
-#define _W(fmt, args...) do { } while(0)
-#define _E(fmt, args...) do { } while(0)
-#endif
-
-#endif /* __COMMON_H__ */

diff --git a/src/plugin-api/deviced/src/syscommon-plugin-deviced-battery.c b/src/plugin-api/deviced/src/syscommon-plugin-deviced-battery.c
index f242f2d..bf459ae 100644 (file)
--- a/src/plugin-api/deviced/src/syscommon-plugin-deviced-battery.c
+++ b/src/plugin-api/deviced/src/syscommon-plugin-deviced-battery.c
@@ -23,11 +23,11 @@
  */
 #include <glib.h>
 
-#include "syscommon-plugin-common.h"
+#include <libsyscommon/log.h>
 
-#include "common.h"
-#include "syscommon-plugin-deviced-battery.h"
-#include "syscommon-plugin-deviced-battery-interface.h"
+#include <system/syscommon-plugin-common.h>
+#include <system/syscommon-plugin-deviced-battery.h>
+#include <system/syscommon-plugin-deviced-battery-interface.h>
 
 #ifndef EXPORT
 #define EXPORT __attribute__((visibility("default")))

diff --git a/src/plugin-api/deviced/src/syscommon-plugin-deviced-display.c b/src/plugin-api/deviced/src/syscommon-plugin-deviced-display.c
index ba04d4e..8819c47 100644 (file)
--- a/src/plugin-api/deviced/src/syscommon-plugin-deviced-display.c
+++ b/src/plugin-api/deviced/src/syscommon-plugin-deviced-display.c
@@ -23,11 +23,11 @@
  */
 #include <glib.h>
 
-#include "syscommon-plugin-common.h"
+#include <libsyscommon/log.h>
 
-#include "common.h"
-#include "syscommon-plugin-deviced-display.h"
-#include "syscommon-plugin-deviced-display-interface.h"
+#include <system/syscommon-plugin-common.h>
+#include <system/syscommon-plugin-deviced-display.h>
+#include <system/syscommon-plugin-deviced-display-interface.h>
 
 #ifndef EXPORT
 #define EXPORT __attribute__((visibility("default")))

diff --git a/src/plugin-api/deviced/src/syscommon-plugin-deviced-input.c b/src/plugin-api/deviced/src/syscommon-plugin-deviced-input.c
index 350e574..2e74d8c 100644 (file)
--- a/src/plugin-api/deviced/src/syscommon-plugin-deviced-input.c
+++ b/src/plugin-api/deviced/src/syscommon-plugin-deviced-input.c
@@ -23,11 +23,11 @@
  */
 #include <glib.h>
 
-#include "syscommon-plugin-common.h"
+#include <libsyscommon/log.h>
 
-#include "common.h"
-#include "syscommon-plugin-deviced-input.h"
-#include "syscommon-plugin-deviced-input-interface.h"
+#include <system/syscommon-plugin-common.h>
+#include <system/syscommon-plugin-deviced-input.h>
+#include <system/syscommon-plugin-deviced-input-interface.h>
 
 #ifndef EXPORT
 #define EXPORT __attribute__((visibility("default")))

diff --git a/src/plugin-api/resourced/CMakeLists.txt b/src/plugin-api/resourced/CMakeLists.txt
index 9060f8e..d595753 100644 (file)
--- a/src/plugin-api/resourced/CMakeLists.txt
+++ b/src/plugin-api/resourced/CMakeLists.txt
@@ -52,7 +52,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${PLUGIN_API_RESOURCED_
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PLUGIN_API_RESOURCED_MAJORVER})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/system/
        DESTINATION ${INCLUDEDIR}
        FILES_MATCHING PATTERN "*.h"
 )

diff --git a/src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk-interface.h b/src/plugin-api/resourced/include/system/syscommon-plugin-resourced-memory-lmk-interface.h
similarity index 100%
rename from src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk-interface.h
rename to src/plugin-api/resourced/include/system/syscommon-plugin-resourced-memory-lmk-interface.h

diff --git a/src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk.h b/src/plugin-api/resourced/include/system/syscommon-plugin-resourced-memory-lmk.h
similarity index 100%
rename from src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk.h
rename to src/plugin-api/resourced/include/system/syscommon-plugin-resourced-memory-lmk.h

diff --git a/src/plugin-api/resourced/src/common.h b/src/plugin-api/resourced/src/common.h
deleted file mode 100644 (file)
index 236c616..0000000
--- a/src/plugin-api/resourced/src/common.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef __COMMON_H__
-#define __COMMON_H__
-
-#ifdef ENABLE_DLOG
-#include <dlog.h>
-
-#define _D(fmt, args...) SLOGD(fmt, ##args)
-#define _I(fmt, args...) SLOGI(fmt, ##args)
-#define _W(fmt, args...) SLOGW(fmt, ##args)
-#define _E(fmt, args...) SLOGE(fmt, ##args)
-#else
-#define _D(fmt, args...) do { } while(0)
-#define _I(fmt, args...) do { } while(0)
-#define _W(fmt, args...) do { } while(0)
-#define _E(fmt, args...) do { } while(0)
-#endif
-
-#endif /* __COMMON_H__ */

diff --git a/src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c b/src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c
index 431625a..0d97201 100644 (file)
--- a/src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c
+++ b/src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c
@@ -25,11 +25,11 @@
 #include <assert.h>
 #include <glib.h>
 
-#include "syscommon-plugin-common.h"
+#include <libsyscommon/log.h>
 
-#include "common.h"
-#include "syscommon-plugin-resourced-memory-lmk.h"
-#include "syscommon-plugin-resourced-memory-lmk-interface.h"
+#include <system/syscommon-plugin-common.h>
+#include <system/syscommon-plugin-resourced-memory-lmk.h>
+#include <system/syscommon-plugin-resourced-memory-lmk-interface.h>
 
 #ifndef EXPORT
 #define EXPORT __attribute__((visibility("default")))