core: Remove duplicate log header file

This patch removes the duplicate log header file in the core directory.
From now, the only log header is the file in the shared directory.

Change-Id: I94d6cae273a7a123c3d65c503d6703d146322f51
Signed-off-by: Wook Song <wook16.song@samsung.com>

diff --git a/src/core/boot.c b/src/core/boot.c
index 97c24581d38a3c0c594be7216bb3e6f47d0cf3b4..d36a3e8b90d7ec0b4cf38496e025cbc9fc30ab3b 100644 (file)
--- a/src/core/boot.c
+++ b/src/core/boot.c
@@ -21,11 +21,11 @@
 #include <bundle.h>
 #include <eventsystem.h>
 
-#include "core/log.h"
 #include "core/device-notifier.h"
 #include "core/common.h"
 #include "core/edbus-handler.h"
 #include "shared/pass-systemd.h"
+#include "shared/log.h"
 
 #define SIGNAL_BOOTING_DONE            "BootingDone"
 

diff --git a/src/core/common.c b/src/core/common.c
index 3d22461fe33b54c2be144497f71a36cda431b19f..0dfc10f4bc1a894a79bb137790eb4d03ce180c2c 100644 (file)
--- a/src/core/common.c
+++ b/src/core/common.c
@@ -34,7 +34,8 @@
 #include <poll.h>
 #include <mntent.h>
 
-#include "log.h"
+#include "shared/log.h"
+
 #include "common.h"
 
 #define BUFF_MAX       255

diff --git a/src/core/config-parser.c b/src/core/config-parser.c
index 880d3582a7f7b7e9ca90dd9885ed58581fbc3290..fe0df234df03dfe29bb44b22b2afd69425bd10eb 100644 (file)
--- a/src/core/config-parser.c
+++ b/src/core/config-parser.c
@@ -19,7 +19,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "log.h"
+
+#include "shared/log.h"
+
 #include "config-parser.h"
 
 #define MAX_LINE       128

diff --git a/src/core/device-idler.c b/src/core/device-idler.c
index 79582a8b4c7077f921519f571389fcb85fcf65cd..edca0426f5b0b8eb3f7780b6e85bf77a703b57dd 100644 (file)
--- a/src/core/device-idler.c
+++ b/src/core/device-idler.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <errno.h>
 
-#include "log.h"
+#include "shared/log.h"
 
 struct device_request {
        void (*func)(void *data);

diff --git a/src/core/device-notifier.c b/src/core/device-notifier.c
index dd88ffe1d9cb706504b0b3961409e66c7686c6be..1195d0c0992e3b2b1ccfc3ae7c59a5944752a19f 100644 (file)
--- a/src/core/device-notifier.c
+++ b/src/core/device-notifier.c
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+#include "shared/log.h"
 
-#include "log.h"
 #include "device-notifier.h"
 #include "list.h"
 #include "common.h"

diff --git a/src/core/devices.c b/src/core/devices.c
index 1fce02cfa1d464355e6c8e342be13858c60daf80..dbfc475cee965d1abcea39b0f140a2d9f19cfee9 100644 (file)
--- a/src/core/devices.c
+++ b/src/core/devices.c
@@ -19,7 +19,8 @@
 
 #include <stdio.h>
 
-#include "log.h"
+#include "shared/log.h"
+
 #include "list.h"
 #include "common.h"
 #include "devices.h"

diff --git a/src/core/edbus-handler.c b/src/core/edbus-handler.c
index 6d06faab9c36dfae6c92eb4d287e8d1a6ef927ea..bcec02a77458006ba18a6b2cd7da0853eb922eaa 100644 (file)
--- a/src/core/edbus-handler.c
+++ b/src/core/edbus-handler.c
@@ -19,12 +19,12 @@
 
 #include <assert.h>
 
-#include "core/log.h"
 #include "core/edbus-handler.h"
 #include "core/common.h"
 #include "core/device-idler.h"
 #include "core/device-notifier.h"
 #include "core/list.h"
+#include "shared/log.h"
 
 #define EDBUS_INIT_RETRY_COUNT 5
 #define NAME_OWNER_CHANGED "NameOwnerChanged"

diff --git a/src/core/execute.c b/src/core/execute.c
index 224ea58cb0b2b51ac60ca0868f20f5407013dd6b..ddfba23d8e9889bdb218da8096553c1372cdbbc6 100755 (executable)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "log.h"
+#include "shared/log.h"
 
 static int parent(pid_t pid)
 {

diff --git a/src/core/log.c b/src/core/log.c
index 2a91d05f77a0167d207d7500f70c291fe4270d4e..866619d2a710c5b129d8d3774f471e5b351d9225 100644 (file)
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -17,7 +17,8 @@
  */
 
 #include <stdio.h>
-#include "log.h"
+
+#include "shared/log.h"
 
 #ifdef DEBUG
 void __cyg_profile_func_enter(void *, void *)

diff --git a/src/core/log.h b/src/core/log.h
deleted file mode 100644 (file)
index 74b866a..0000000
--- a/src/core/log.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * PASS
- *
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef __LOG_H__
-#define __LOG_H__
-
-#ifdef ENABLE_PASS_DLOG
-#define ENABLE_DLOG
-#endif
-
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-
-#define LOG_TAG "PASS"
-#include "shared/log-macro.h"
-#endif

diff --git a/src/core/main.c b/src/core/main.c
index 78e9680af55c0f84b3d950872bef1626212ca6af..233ef0ef78440cfc5fa6f30eafb20fcff24ef323 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -21,13 +21,14 @@
 #include <fcntl.h>
 #include <sys/reboot.h>
 
-#include "log.h"
-#include "common.h"
-#include "edbus-handler.h"
-#include "devices.h"
 #include "shared/dbus.h"
+#include "shared/log.h"
+
 #include "boot.h"
+#include "common.h"
 #include "device-notifier.h"
+#include "devices.h"
+#include "edbus-handler.h"
 
 #define PIDFILE_PATH           "/var/run/.pass.pid"
 

diff --git a/src/core/sig-handler.c b/src/core/sig-handler.c
index 9d31cc2fa0c10ad15b14cf625fa97e267c84cac3..1b51787b722bdb6ea1fd78a16a8798ad898491af 100644 (file)
--- a/src/core/sig-handler.c
+++ b/src/core/sig-handler.c
@@ -21,9 +21,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "log.h"
-#include "devices.h"
+#include "shared/log.h"
+
 #include "common.h"
+#include "devices.h"
 
 static struct sigaction sig_child_old_act;
 static struct sigaction sig_pipe_old_act;

diff --git a/src/core/udev.c b/src/core/udev.c
index 262e12fc4deb8d08fb27c7da5e6365bb5f953b89..39e49d9febf4abd611c6368f013cc5fbeae0fde6 100644 (file)
--- a/src/core/udev.c
+++ b/src/core/udev.c
@@ -21,12 +21,13 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "log.h"
+#include "shared/log.h"
+
 #include "device-notifier.h"
 #include "devices.h"
-#include "udev.h"
-#include "list.h"
 #include "edbus-handler.h"
+#include "list.h"
+#include "udev.h"
 
 #define KERNEL          "kernel"
 #define UDEV            "udev"

diff --git a/src/pass/pass.h b/src/pass/pass.h
index 331f56637fb710f3e8b351d5d1d008a7344c5bb2..80b549760b642a87c0bbf88294a7baced676d5a8 100644 (file)
--- a/src/pass/pass.h
+++ b/src/pass/pass.h
@@ -22,7 +22,8 @@
 
 #include <stdio.h>
 #include <Ecore.h>
-#include "core/log.h"
+
+#include "shared/log.h"
 
 /******************************************************
  *                   PASS Governors                   *

diff --git a/src/pmqos/pmqos-parser.c b/src/pmqos/pmqos-parser.c
index 10302c578294f6bc2bdb26a8167784cdc4cc1317..1814e8482879d5f7657fb26805fc2be06fab0d3c 100644 (file)
--- a/src/pmqos/pmqos-parser.c
+++ b/src/pmqos/pmqos-parser.c
@@ -23,9 +23,10 @@
 #include <errno.h>
 #include <string.h>
 
-#include "core/log.h"
-#include "core/edbus-handler.h"
 #include "core/config-parser.h"
+#include "core/edbus-handler.h"
+#include "shared/log.h"
+
 #include "pmqos.h"
 
 static bool is_supported(const char *value)

diff --git a/src/pmqos/pmqos.c b/src/pmqos/pmqos.c
index 63ff6b6de32513c2c51c7bbfec710d00cc7c023c..dff38943dd19a68c3a96b735b95babce86574402 100644 (file)
--- a/src/pmqos/pmqos.c
+++ b/src/pmqos/pmqos.c
@@ -23,12 +23,13 @@
 #include <Ecore.h>
 #include <device-node.h>
 
-#include "core/log.h"
 #include "core/edbus-handler.h"
 #include "core/devices.h"
 #include "core/common.h"
 #include "core/list.h"
 #include "core/device-notifier.h"
+#include "shared/log.h"
+
 #include "pmqos.h"
 
 #define DEFAULT_PMQOS_TIMER            3000

diff --git a/src/shared/pass-systemd.c b/src/shared/pass-systemd.c
index e7f5f6f8170823ce0fdcb7e5fd974971010ac198..d418da2fb2adbac874b030e669e3daee8a37035b 100644 (file)
--- a/src/shared/pass-systemd.c
+++ b/src/shared/pass-systemd.c
@@ -26,12 +26,12 @@
 #include <dbus/dbus.h>
 #include <gio/gio.h>
 
+#include "shared/log.h"
+
 #include "common.h"
 #include "dbus.h"
 #include "pass-systemd.h"
 
-#include "core/log.h"
-
 
 #define SYSTEMD_UNIT_ESCAPE_CHAR       ".-"