e_error: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: I4a1cbfd06fe799859da91314df590aaaa854c614

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 6504979b51aaf0dd94e45b6b15961e66f08af6d5..1d15ef82aa65f8a47108fb8387c8064f4380d0ec 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -41,7 +41,6 @@ src/bin/e_dnd.h \
 src/bin/e_dpms.h \
 src/bin/e_env.h \
 src/bin/e_eom.h \
-src/bin/e_error.h \
 src/bin/e_focus_policy_iface.h \
 src/bin/e_focus.h \
 src/bin/e_grabinput.h \

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 9034c74caf429c6909cc12f9e3926573968d5a4a..5d13fb1f63d53afef9cb3d589f793ff963dbda62 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -10,6 +10,7 @@
 #include "e_comp_wl_tizen_hwc_intern.h"
 #include "e_comp_intern.h"
 #include "e_input_intern.h"
+#include "e_error_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index ff2ef307b7e1e0ac7ec2e378fd2aaf5fbf0d9ed1..22c57687868a34add91cd48a36f1204a6768e95c 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -24,6 +24,7 @@
 #include "e_comp_intern.h"
 #include "e_input_intern.h"
 #include "e_keyrouter_intern.h"
+#include "e_error_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_tbm.c b/src/bin/e_comp_wl_tbm.c
index 4cdc9b81171335584eaf0aeb0e554eedc4a8c10f..8653abfebd92d9fd8c894b85e6e52bb2c732ba96 100644 (file)
--- a/src/bin/e_comp_wl_tbm.c
+++ b/src/bin/e_comp_wl_tbm.c
@@ -4,6 +4,7 @@
 #include "e_utils_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
+#include "e_error_intern.h"
 
 #include <wayland-tbm-server.h>
 #include <tbm_bufmgr.h>

diff --git a/src/bin/e_comp_wl_tizen_hwc.c b/src/bin/e_comp_wl_tizen_hwc.c
index cb8237af72727615ffdf82d41962550e43d4015f..bdf456c9e35ab7e2bbdac1b4560b1e8f471d4ac7 100644 (file)
--- a/src/bin/e_comp_wl_tizen_hwc.c
+++ b/src/bin/e_comp_wl_tizen_hwc.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_comp_wl_tizen_hwc_intern.h"
 #include "e_utils_intern.h"
+#include "e_error_intern.h"
 
 #include <tizen-hwc-server-protocol.h>
 

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 9badf41a005d127378ccf0a58d12671dcb4c2cf0..3dc94e5cb44fd8449cc1330c8614d1e21faeb96c 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -3,6 +3,7 @@
 #include "e_user_intern.h"
 #include "e_utils_intern.h"
 #include "e_prefix_intern.h"
+#include "e_error_intern.h"
 
 E_API E_Config *e_config = NULL;
 

diff --git a/src/bin/e_error.c b/src/bin/e_error.c
index 8e5c529c0f9b0225cf6ee16eedade304cda2b088..edbee202264125fed3aaf913e696fc54edbc977c 100644 (file)
--- a/src/bin/e_error.c
+++ b/src/bin/e_error.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_error_intern.h"
 
 /* local subsystem functions */
 

diff --git a/src/bin/e_error.h b/src/bin/e_error.h
deleted file mode 100644 (file)
index 737052a..0000000
--- a/src/bin/e_error.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifdef E_TYPEDEFS
-
-#define e_error_message_show(args...) do \
-{ \
-   char __tmpbuf[4096]; \
- \
-   snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \
-   e_error_message_show_internal(__tmpbuf); \
-} while (0)
-
-#else
-#ifndef E_ERROR_H
-#define E_ERROR_H
-
-EINTERN void e_error_message_show_internal(char *txt);
-
-#endif
-#endif

diff --git a/src/bin/e_error_intern.h b/src/bin/e_error_intern.h
new file mode 100644 (file)
index 0000000..f1c12fe
--- /dev/null
+++ b/src/bin/e_error_intern.h
@@ -0,0 +1,14 @@
+#ifndef E_ERROR_INTERN_H
+#define E_ERROR_INTERN_H
+
+#define e_error_message_show(args...) do \
+{ \
+   char __tmpbuf[4096]; \
+ \
+   snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \
+   e_error_message_show_internal(__tmpbuf); \
+} while (0)
+
+EINTERN void e_error_message_show_internal(char *txt);
+
+#endif

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index dd0fefa55cf11171fdf16e74d2f7ea06287a735c..6a085a3e03cb650018592fe96718f4e06a4efd89 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -3,6 +3,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
 #include "services/e_service_quickpanel.h"
+#include "e_error_intern.h"
 
 #include <Evas_GL.h>
 #include <gbm.h>

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index a1fc39b80a39e51e7468b3f27af3ca33b5f7b2ff..096e8992d78cbc9f48a75b19f8a431e42d17a490 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -1,6 +1,5 @@
 #include "e_object.h"
 #include "e_path.h"
-#include "e_error.h"
 #include "e_focus_policy_iface.h"
 #include "e_focus.h"
 #include "e_zone.h"

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index f0b5ac24909a48873eeae2f539684f5439cce93c..b126090df1856c7c9fbd8a9a62f1e2795006906b 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -17,6 +17,7 @@
 #include "e_info_server_intern.h"
 #include "e_icon_intern.h"
 #include "e_devicemgr_intern.h"
+#include "e_error_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>

diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index 4d36692ad39abba1abf6cf6bef3ea08cc1e77555..eae48b2e3316d921edff8ac29ebe03604ec5619a 100644 (file)
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_error_intern.h"
 
 /* yes - i know. glibc specific... but i like being able to do my own */
 /* backtraces! NB: you need CFLAGS="-rdynamic -g" LDFLAGS="-rdynamic -g" */

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 612f34e1af6405718e17c47baa6ba24c0aba4c37..92e6d3f67e1753bc70ded268be16b212b4296718 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -7,6 +7,7 @@
 #include "e_comp_wl_tbm_intern.h"
 #include "e_comp_intern.h"
 #include "e_input_intern.h"
+#include "e_error_intern.h"
 
 #include <device/board-internal.h>