summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/edje/edje_cc.h6
-rw-r--r--src/bin/edje/edje_cc_parse.c2
-rw-r--r--src/bin/edje/edje_decc.h6
-rw-r--r--src/bin/edje/edje_external_inspector.c2
-rw-r--r--src/bin/edje/edje_inspector.c2
-rw-r--r--src/bin/eet/eet_main.c8
-rw-r--r--src/bin/efreet/efreetd.h6
-rw-r--r--src/bin/ethumb_client/ethumbd.c8
-rw-r--r--src/bin/evas/evas_cserve2.h8
-rw-r--r--src/bin/evas/evas_cserve2_cache.c4
-rw-r--r--src/bin/evas/evas_cserve2_index.c8
-rw-r--r--src/bin/evas/evas_cserve2_requests.c2
-rw-r--r--src/bin/evas/evas_cserve2_shm.c4
-rw-r--r--src/edje_external/emotion/emotion.c2
-rw-r--r--src/examples/ephysics/ephysics_test.h6
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_private.h6
-rw-r--r--src/lib/ecore/ecore_time.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h6
-rw-r--r--src/lib/ecore_con/ecore_con_private.h6
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h6
-rw-r--r--src/lib/ecore_file/ecore_file_download.c2
-rw-r--r--src/lib/ecore_file/ecore_file_private.h6
-rw-r--r--src/lib/ecore_imf/ecore_imf_private.h6
-rw-r--r--src/lib/ecore_input/ecore_input_private.h6
-rw-r--r--src/lib/ecore_input_evas/ecore_input_evas_private.h6
-rw-r--r--src/lib/ecore_ipc/ecore_ipc_private.h6
-rw-r--r--src/lib/ecore_psl1ght/ecore_psl1ght_private.h6
-rw-r--r--src/lib/ecore_sdl/ecore_sdl_private.h6
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h6
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb.c2
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_error.c6
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_private.h6
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_private.h8
-rw-r--r--src/lib/edje/edje_convert.c18
-rw-r--r--src/lib/edje/edje_lua.c2
-rw-r--r--src/lib/edje/edje_private.h6
-rw-r--r--src/lib/eet/Eet_private.h8
-rw-r--r--src/lib/eet/eet_data.c10
-rw-r--r--src/lib/eet/eet_lib.c10
-rw-r--r--src/lib/efreet/efreet_base.c8
-rw-r--r--src/lib/efreet/efreet_private.h6
-rw-r--r--src/lib/eina/eina_binshare.c8
-rw-r--r--src/lib/eina/eina_model.c34
-rw-r--r--src/lib/eina/eina_stringshare.c10
-rw-r--r--src/lib/eina/eina_ustringshare.c8
-rw-r--r--src/lib/eio/eio_private.h8
-rw-r--r--src/lib/eldbus/eldbus_core.c12
-rw-r--r--src/lib/eldbus/eldbus_object.c2
-rw-r--r--src/lib/eldbus/eldbus_private.h2
-rw-r--r--src/lib/eldbus/eldbus_proxy.c2
-rw-r--r--src/lib/emotion/emotion_private.h2
-rw-r--r--src/lib/eo/eo_private.h6
-rw-r--r--src/lib/ephysics/ephysics_private.h6
-rw-r--r--src/lib/ethumb_client/ethumb_client.c2
-rw-r--r--src/lib/evas/canvas/evas_clip.c10
-rw-r--r--src/lib/evas/canvas/evas_object_box.c4
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c8
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c8
-rw-r--r--src/lib/evas/canvas/evas_object_table.c4
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c6
-rw-r--r--src/lib/evas/common/evas_image_load.c4
-rw-r--r--src/lib/evas/common/evas_thread_render.c6
-rw-r--r--src/lib/evas/cserve2/evas_cs2_client.c12
-rw-r--r--src/lib/evas/include/evas_common_private.h6
-rw-r--r--src/lib/evas/main.c10
-rw-r--r--src/modules/ecore/system/systemd/ecore_system_systemd.c6
-rw-r--r--src/modules/ecore/system/tizen/ecore_system_tizen.c6
-rw-r--r--src/modules/ecore/system/upower/ecore_system_upower.c6
-rw-r--r--src/modules/ecore_imf/xim/ecore_imf_xim.c6
-rw-r--r--src/modules/emotion/generic/emotion_generic.c8
-rw-r--r--src/modules/emotion/gstreamer/emotion_gstreamer.h6
-rw-r--r--src/modules/emotion/gstreamer1/emotion_gstreamer.h6
-rw-r--r--src/modules/emotion/xine/emotion_xine.c2
-rw-r--r--src/modules/emotion/xine/emotion_xine.h6
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.h6
-rw-r--r--src/modules/evas/engines/drm/evas_engine.h6
-rw-r--r--src/modules/evas/engines/fb/evas_engine.h6
-rw-r--r--src/modules/evas/engines/fb/evas_fb_main.c6
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.h6
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core_private.h6
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_private.h6
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.c2
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.h6
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.h6
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.h6
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.h6
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.h6
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.h6
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h6
94 files changed, 289 insertions, 289 deletions
diff --git a/src/bin/edje/edje_cc.h b/src/bin/edje/edje_cc.h
index f1c9367fa3..3d9973d9a9 100644
--- a/src/bin/edje/edje_cc.h
+++ b/src/bin/edje/edje_cc.h
@@ -30,10 +30,10 @@ extern int _edje_cc_log_dom ;
30# undef WRN 30# undef WRN
31#endif 31#endif
32#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__) 32#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__)
33#ifdef CRIT 33#ifdef CRI
34# undef CRIT 34# undef CRI
35#endif 35#endif
36#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__) 36#define CRI(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__)
37#ifdef DBG 37#ifdef DBG
38# undef DBG 38# undef DBG
39#endif 39#endif
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index 4b58295866..2b35c8973f 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -808,7 +808,7 @@ compile(void)
808 fd = mkstemp(tmpn); 808 fd = mkstemp(tmpn);
809 if (fd < 0) 809 if (fd < 0)
810 { 810 {
811 CRIT("Unable to open temp file \"%s\" for pre-processor.", tmpn); 811 CRI("Unable to open temp file \"%s\" for pre-processor.", tmpn);
812 exit(-1); 812 exit(-1);
813 } 813 }
814 814
diff --git a/src/bin/edje/edje_decc.h b/src/bin/edje/edje_decc.h
index 5aa52e540f..2dda39935a 100644
--- a/src/bin/edje/edje_decc.h
+++ b/src/bin/edje/edje_decc.h
@@ -19,10 +19,10 @@ extern int _edje_cc_log_dom ;
19# undef WRN 19# undef WRN
20#endif 20#endif
21#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__) 21#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__)
22#ifdef CRIT 22#ifdef CRI
23# undef CRIT 23# undef CRI
24#endif 24#endif
25#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__) 25#define CRI(...) EINA_LOG_DOM_CRIT(_edje_cc_log_dom, __VA_ARGS__)
26#ifdef DBG 26#ifdef DBG
27# undef DBG 27# undef DBG
28#endif 28#endif
diff --git a/src/bin/edje/edje_external_inspector.c b/src/bin/edje/edje_external_inspector.c
index 6b1a521246..01e3d22fce 100644
--- a/src/bin/edje/edje_external_inspector.c
+++ b/src/bin/edje/edje_external_inspector.c
@@ -15,7 +15,7 @@ static int _log_dom;
15#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__) 15#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
16#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__) 16#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
17#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) 17#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
18#define CRIT(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 18#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
19 19
20#define INDENT " " 20#define INDENT " "
21#define INDENT2 INDENT INDENT 21#define INDENT2 INDENT INDENT
diff --git a/src/bin/edje/edje_inspector.c b/src/bin/edje/edje_inspector.c
index de65162144..8dc852566b 100644
--- a/src/bin/edje/edje_inspector.c
+++ b/src/bin/edje/edje_inspector.c
@@ -20,7 +20,7 @@ static int _log_dom;
20#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__) 20#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
21#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__) 21#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
22#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) 22#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
23#define CRIT(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 23#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
24 24
25#define INDENT " " 25#define INDENT " "
26#define INDENT2 INDENT INDENT 26#define INDENT2 INDENT INDENT
diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c
index 05ad423916..dc493ef97e 100644
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@@ -35,10 +35,10 @@ static int _eet_main_log_dom = -1;
35#undef WRN 35#undef WRN
36#endif /* ifdef WRN */ 36#endif /* ifdef WRN */
37#define WRN(...) EINA_LOG_DOM_WARN(_eet_main_log_dom, __VA_ARGS__) 37#define WRN(...) EINA_LOG_DOM_WARN(_eet_main_log_dom, __VA_ARGS__)
38#ifdef CRIT 38#ifdef CRI
39#undef CRIT 39#undef CRI
40#endif /* ifdef CRIT */ 40#endif /* ifdef CRI */
41#define CRIT(...) EINA_LOG_DOM_CRIT(_eet_main_log_dom, __VA_ARGS__) 41#define CRI(...) EINA_LOG_DOM_CRIT(_eet_main_log_dom, __VA_ARGS__)
42 42
43static void 43static void
44do_eet_list(const char *file, Eina_Bool verbose) 44do_eet_list(const char *file, Eina_Bool verbose)
diff --git a/src/bin/efreet/efreetd.h b/src/bin/efreet/efreetd.h
index a6931e3282..15cbcd1f45 100644
--- a/src/bin/efreet/efreetd.h
+++ b/src/bin/efreet/efreetd.h
@@ -8,10 +8,10 @@
8 8
9extern int efreetd_log_dom; 9extern int efreetd_log_dom;
10 10
11#ifdef CRITICAL 11#ifdef CRI
12#undef CRITICAL 12#undef CRI
13#endif 13#endif
14#define CRITICAL(...) EINA_LOG_DOM_CRIT(efreetd_log_dom, __VA_ARGS__) 14#define CRI(...) EINA_LOG_DOM_CRIT(efreetd_log_dom, __VA_ARGS__)
15#ifdef ERR 15#ifdef ERR
16#undef ERR 16#undef ERR
17#endif 17#endif
diff --git a/src/bin/ethumb_client/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index 5d583688b7..d8140aa925 100644
--- a/src/bin/ethumb_client/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -51,7 +51,7 @@
51#define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__) 51#define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__)
52#define WRN(...) EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__) 52#define WRN(...) EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__)
53#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__) 53#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__)
54#define CRIT(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__) 54#define CRI(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
55 55
56static const char _ethumb_dbus_bus_name[] = "org.enlightenment.Ethumb"; 56static const char _ethumb_dbus_bus_name[] = "org.enlightenment.Ethumb";
57static const char _ethumb_dbus_interface[] = "org.enlightenment.Ethumb"; 57static const char _ethumb_dbus_interface[] = "org.enlightenment.Ethumb";
@@ -786,7 +786,7 @@ _ethumb_table_append(Ethumbd *ed)
786 tmp = realloc(q->table, new_max * sizeof(Ethumbd_Object)); 786 tmp = realloc(q->table, new_max * sizeof(Ethumbd_Object));
787 if (!tmp) 787 if (!tmp)
788 { 788 {
789 CRIT("could not realloc q->table to %zd bytes: %s", 789 CRI("could not realloc q->table to %zd bytes: %s",
790 new_max * sizeof(Ethumbd_Object), strerror(errno)); 790 new_max * sizeof(Ethumbd_Object), strerror(errno));
791 return -1; 791 return -1;
792 } 792 }
@@ -796,7 +796,7 @@ _ethumb_table_append(Ethumbd *ed)
796 tmp = realloc(q->list, new_max * sizeof(int)); 796 tmp = realloc(q->list, new_max * sizeof(int));
797 if (!tmp) 797 if (!tmp)
798 { 798 {
799 CRIT("could not realloc q->list to %zd bytes: %s", 799 CRI("could not realloc q->list to %zd bytes: %s",
800 new_max * sizeof(int), strerror(errno)); 800 new_max * sizeof(int), strerror(errno));
801 return -1; 801 return -1;
802 } 802 }
@@ -813,7 +813,7 @@ _ethumb_table_append(Ethumbd *ed)
813 813
814 if (i >= q->max_count) 814 if (i >= q->max_count)
815 { 815 {
816 CRIT("cannot find free table slot in table of %i", q->max_count); 816 CRI("cannot find free table slot in table of %i", q->max_count);
817 return -1; 817 return -1;
818 } 818 }
819 819
diff --git a/src/bin/evas/evas_cserve2.h b/src/bin/evas/evas_cserve2.h
index e49bfc451d..6732d075dd 100644
--- a/src/bin/evas/evas_cserve2.h
+++ b/src/bin/evas/evas_cserve2.h
@@ -8,13 +8,13 @@
8#define CSERVE2_LOG_LEVEL 4 8#define CSERVE2_LOG_LEVEL 4
9#endif 9#endif
10 10
11#ifdef CRIT 11#ifdef CRI
12#undef CRIT 12#undef CRI
13#endif 13#endif
14#if CSERVE2_LOG_LEVEL >= 0 14#if CSERVE2_LOG_LEVEL >= 0
15#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_cserve2_bin_log_dom, __VA_ARGS__) 15#define CRI(...) EINA_LOG_DOM_CRIT(_evas_cserve2_bin_log_dom, __VA_ARGS__)
16#else 16#else
17#define CRIT(...) do {} while(0) 17#define CRI(...) do {} while(0)
18#endif 18#endif
19 19
20#ifdef ERR 20#ifdef ERR
diff --git a/src/bin/evas/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index 4322be2386..d3429f6db3 100644
--- a/src/bin/evas/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -1054,7 +1054,7 @@ _image_entry_free(Image_Entry *ientry)
1054 idata = _image_data_find(ENTRYID(ientry)); 1054 idata = _image_data_find(ENTRYID(ientry));
1055 if (!idata || !idata->refcount) 1055 if (!idata || !idata->refcount)
1056 { 1056 {
1057 CRIT("Trying to free already freed object: %u", ENTRYID(ientry)); 1057 CRI("Trying to free already freed object: %u", ENTRYID(ientry));
1058 return; 1058 return;
1059 } 1059 }
1060 1060
@@ -2795,7 +2795,7 @@ do_scaling:
2795 { 2795 {
2796 if (orig_entry->base.id != image_id) 2796 if (orig_entry->base.id != image_id)
2797 { 2797 {
2798 CRIT("Entry IDs mismatch"); 2798 CRI("Entry IDs mismatch");
2799 return -1; 2799 return -1;
2800 } 2800 }
2801 orig_entry->base.request = cserve2_request_add( 2801 orig_entry->base.request = cserve2_request_add(
diff --git a/src/bin/evas/evas_cserve2_index.c b/src/bin/evas/evas_cserve2_index.c
index f0d6f71a58..284b0a6299 100644
--- a/src/bin/evas/evas_cserve2_index.c
+++ b/src/bin/evas/evas_cserve2_index.c
@@ -820,7 +820,7 @@ _shared_mempool_buffer_del(Shared_Mempool *sm, int bufferid)
820 ie = _shared_index_entry_get_by_id(sm->index, bufferid); 820 ie = _shared_index_entry_get_by_id(sm->index, bufferid);
821 if (!ie || ie->refcount <= 0) 821 if (!ie || ie->refcount <= 0)
822 { 822 {
823 CRIT("Tried to delete invalid buffer or with refcount 0"); 823 CRI("Tried to delete invalid buffer or with refcount 0");
824 return NULL; 824 return NULL;
825 } 825 }
826 826
@@ -857,7 +857,7 @@ cserve2_shared_mempool_buffer_get(Shared_Mempool *sm, int bufferid)
857 ie = _shared_index_entry_get_by_id(sm->index, bufferid); 857 ie = _shared_index_entry_get_by_id(sm->index, bufferid);
858 if (!ie || ie->refcount <= 0) 858 if (!ie || ie->refcount <= 0)
859 { 859 {
860 CRIT("Tried to access invalid buffer or with refcount 0"); 860 CRI("Tried to access invalid buffer or with refcount 0");
861 return NULL; 861 return NULL;
862 } 862 }
863 863
@@ -874,7 +874,7 @@ cserve2_shared_mempool_buffer_offset_get(Shared_Mempool *sm, int bufferid)
874 ie = _shared_index_entry_get_by_id(sm->index, bufferid); 874 ie = _shared_index_entry_get_by_id(sm->index, bufferid);
875 if (!ie || ie->refcount <= 0) 875 if (!ie || ie->refcount <= 0)
876 { 876 {
877 CRIT("Tried to access invalid buffer or with refcount 0"); 877 CRI("Tried to access invalid buffer or with refcount 0");
878 return -1; 878 return -1;
879 } 879 }
880 880
@@ -1000,7 +1000,7 @@ cserve2_shared_string_del(int id)
1000 if (!eina_hash_del_by_key(_string_entries, data)) 1000 if (!eina_hash_del_by_key(_string_entries, data))
1001 { 1001 {
1002 if (!eina_hash_del_by_data(_string_entries, (void *) (intptr_t) id)) 1002 if (!eina_hash_del_by_data(_string_entries, (void *) (intptr_t) id))
1003 CRIT("Invalid free"); 1003 CRI("Invalid free");
1004 } 1004 }
1005 } 1005 }
1006 _shared_strings_unref_items++; 1006 _shared_strings_unref_items++;
diff --git a/src/bin/evas/evas_cserve2_requests.c b/src/bin/evas/evas_cserve2_requests.c
index 9a8eb2f4c0..98300feb45 100644
--- a/src/bin/evas/evas_cserve2_requests.c
+++ b/src/bin/evas/evas_cserve2_requests.c
@@ -296,7 +296,7 @@ cserve2_request_dependents_drop(Slave_Request *req, Slave_Request_Type type)
296 296
297 if (type != CSERVE2_REQ_IMAGE_SPEC_LOAD) 297 if (type != CSERVE2_REQ_IMAGE_SPEC_LOAD)
298 { 298 {
299 CRIT("Only CSERVE2_REQ_IMAGE_SPEC_LOAD is supported."); 299 CRI("Only CSERVE2_REQ_IMAGE_SPEC_LOAD is supported.");
300 return; 300 return;
301 } 301 }
302 302
diff --git a/src/bin/evas/evas_cserve2_shm.c b/src/bin/evas/evas_cserve2_shm.c
index b172c52242..d88d12a59f 100644
--- a/src/bin/evas/evas_cserve2_shm.c
+++ b/src/bin/evas/evas_cserve2_shm.c
@@ -168,13 +168,13 @@ cserve2_shm_resize(Shm_Handle *shm, size_t newsize)
168 168
169 if (shm->map_offset || shm->image_offset) 169 if (shm->map_offset || shm->image_offset)
170 { 170 {
171 CRIT("Can not resize shm with non-zero offset"); 171 CRI("Can not resize shm with non-zero offset");
172 return NULL; 172 return NULL;
173 } 173 }
174 174
175 if (eina_inlist_count(shm->mapping->segments) > 1) 175 if (eina_inlist_count(shm->mapping->segments) > 1)
176 { 176 {
177 CRIT("Can not resize shm with more than one segment"); 177 CRI("Can not resize shm with more than one segment");
178 return NULL; 178 return NULL;
179 } 179 }
180 180
diff --git a/src/edje_external/emotion/emotion.c b/src/edje_external/emotion/emotion.c
index 7ae0a0e5ca..77ed0a71ee 100644
--- a/src/edje_external/emotion/emotion.c
+++ b/src/edje_external/emotion/emotion.c
@@ -44,7 +44,7 @@ struct _External_Emotion_Signals_Proxy_Context
44}; 44};
45 45
46static int _log_dom = -1; 46static int _log_dom = -1;
47#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 47#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
48#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) 48#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
49#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__) 49#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
50#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__) 50#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
diff --git a/src/examples/ephysics/ephysics_test.h b/src/examples/ephysics/ephysics_test.h
index 56db5957b1..ff65b8c0a6 100644
--- a/src/examples/ephysics/ephysics_test.h
+++ b/src/examples/ephysics/ephysics_test.h
@@ -33,10 +33,10 @@
33#endif 33#endif
34#define WRN(...) EINA_LOG_DOM_WARN(_ephysics_test_log_dom, __VA_ARGS__) 34#define WRN(...) EINA_LOG_DOM_WARN(_ephysics_test_log_dom, __VA_ARGS__)
35 35
36#ifdef CRIT 36#ifdef CRI
37# undef CRIT 37# undef CRI
38#endif 38#endif
39#define CRIT(...) EINA_LOG_DOM_CRIT(_ephysics_test_log_dom, __VA_ARGS__) 39#define CRI(...) EINA_LOG_DOM_CRIT(_ephysics_test_log_dom, __VA_ARGS__)
40 40
41#define EPHYSICS_TEST_THEME "ephysics_test" 41#define EPHYSICS_TEST_THEME "ephysics_test"
42#define WIDTH (512) 42#define WIDTH (512)
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 44fb957f51..e1ee7b1e96 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -858,7 +858,7 @@ _ecore_main_loop_init(void)
858#ifdef USE_G_MAIN_LOOP 858#ifdef USE_G_MAIN_LOOP
859 ecore_glib_source = g_source_new(&ecore_gsource_funcs, sizeof (GSource)); 859 ecore_glib_source = g_source_new(&ecore_gsource_funcs, sizeof (GSource));
860 if (!ecore_glib_source) 860 if (!ecore_glib_source)
861 CRIT("Failed to create glib source for epoll!"); 861 CRI("Failed to create glib source for epoll!");
862 else 862 else
863 { 863 {
864 g_source_set_priority(ecore_glib_source, G_PRIORITY_HIGH_IDLE + 20); 864 g_source_set_priority(ecore_glib_source, G_PRIORITY_HIGH_IDLE + 20);
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index f6a2d5553a..7be334ce3a 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -34,10 +34,10 @@ extern int _ecore_log_dom;
34#endif 34#endif
35#define WRN(...) EINA_LOG_DOM_WARN(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__) 35#define WRN(...) EINA_LOG_DOM_WARN(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
36 36
37#ifdef CRIT 37#ifdef CRI
38# undef CRIT 38# undef CRI
39#endif 39#endif
40#define CRIT(...) EINA_LOG_DOM_CRIT(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__) 40#define CRI(...) EINA_LOG_DOM_CRIT(_ECORE_DEFAULT_LOG_DOM, __VA_ARGS__)
41 41
42#ifndef PATH_MAX 42#ifndef PATH_MAX
43# define PATH_MAX 4096 43# define PATH_MAX 4096
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index d3bac94310..79dff91876 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -57,7 +57,7 @@ ecore_time_get(void)
57 57
58 if (EINA_UNLIKELY(clock_gettime(_ecore_time_clock_id, &t))) 58 if (EINA_UNLIKELY(clock_gettime(_ecore_time_clock_id, &t)))
59 { 59 {
60 CRIT("Cannot get current time."); 60 CRI("Cannot get current time.");
61 /* Try to at least return the latest value retrieved*/ 61 /* Try to at least return the latest value retrieved*/
62 return _ecore_time_loop_time; 62 return _ecore_time_loop_time;
63 } 63 }
@@ -152,7 +152,7 @@ _ecore_time_init(void)
152 else 152 else
153 { 153 {
154 _ecore_time_clock_id = -2; 154 _ecore_time_clock_id = -2;
155 CRIT("Cannot get a valid clock_gettime() clock id! " 155 CRI("Cannot get a valid clock_gettime() clock id! "
156 "Fallback to unix time."); 156 "Fallback to unix time.");
157 } 157 }
158#else 158#else
@@ -170,8 +170,8 @@ _ecore_time_init(void)
170 } 170 }
171# else 171# else
172# warning "Your platform isn't supported yet" 172# warning "Your platform isn't supported yet"
173 CRIT("Platform does not support clock_gettime. " 173 CRI("Platform does not support clock_gettime. "
174 "Fallback to unix time."); 174 "Fallback to unix time.");
175# endif 175# endif
176# endif 176# endif
177#endif 177#endif
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index 35afa85f4c..b997ea8e03 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -57,10 +57,10 @@ extern int _ecore_audio_log_dom;
57#endif 57#endif
58#define WRN(...) EINA_LOG_DOM_WARN(_ecore_audio_log_dom, __VA_ARGS__) 58#define WRN(...) EINA_LOG_DOM_WARN(_ecore_audio_log_dom, __VA_ARGS__)
59 59
60#ifdef CRIT 60#ifdef CRI
61#undef CRIT 61#undef CRI
62#endif 62#endif
63#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_audio_log_dom, __VA_ARGS__) 63#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_audio_log_dom, __VA_ARGS__)
64 64
65/** 65/**
66 * @defgroup Ecore_Audio_Module_API_Group Ecore_Audio_Module_API - API for modules 66 * @defgroup Ecore_Audio_Module_API_Group Ecore_Audio_Module_API - API for modules
diff --git a/src/lib/ecore_con/ecore_con_private.h b/src/lib/ecore_con/ecore_con_private.h
index ea9fada698..297162bb63 100644
--- a/src/lib/ecore_con/ecore_con_private.h
+++ b/src/lib/ecore_con/ecore_con_private.h
@@ -47,10 +47,10 @@ extern int _ecore_con_log_dom;
47#endif 47#endif
48#define WRN(...) EINA_LOG_DOM_WARN(_ecore_con_log_dom, __VA_ARGS__) 48#define WRN(...) EINA_LOG_DOM_WARN(_ecore_con_log_dom, __VA_ARGS__)
49 49
50#ifdef CRIT 50#ifdef CRI
51# undef CRIT 51# undef CRI
52#endif 52#endif
53#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_con_log_dom, __VA_ARGS__) 53#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_con_log_dom, __VA_ARGS__)
54 54
55typedef struct _Ecore_Con_Lookup Ecore_Con_Lookup; 55typedef struct _Ecore_Con_Lookup Ecore_Con_Lookup;
56typedef struct _Ecore_Con_Info Ecore_Con_Info; 56typedef struct _Ecore_Con_Info Ecore_Con_Info;
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index 345144419e..624ec780f5 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -355,7 +355,7 @@ _ecore_con_socks_read_v5(Ecore_Con_Server *svr, Ecore_Con_Socks_v5 *v5, const un
355 switch (v5->method) 355 switch (v5->method)
356 { 356 {
357 case ECORE_CON_SOCKS_V5_METHOD_NONE: 357 case ECORE_CON_SOCKS_V5_METHOD_NONE:
358 CRIT("HOW DID THIS HAPPEN?????????"); 358 CRI("HOW DID THIS HAPPEN?????????");
359 goto error; 359 goto error;
360 360
361 case ECORE_CON_SOCKS_V5_METHOD_GSSAPI: 361 case ECORE_CON_SOCKS_V5_METHOD_GSSAPI:
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index e338016898..ecf4d74638 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -171,7 +171,7 @@ _ecore_evas_interface_get(const Ecore_Evas *ee, const char *iname)
171 return i; 171 return i;
172 } 172 }
173 173
174 CRIT("Ecore_Evas %p (engine: %s) does not have interface '%s'", 174 CRI("Ecore_Evas %p (engine: %s) does not have interface '%s'",
175 ee, ee->driver, iname); 175 ee, ee->driver, iname);
176 176
177 return NULL; 177 return NULL;
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 726f044e47..3158e8aa30 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -28,10 +28,10 @@ EAPI extern int _ecore_evas_log_dom;
28# undef WRN 28# undef WRN
29#endif 29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_evas_log_dom, __VA_ARGS__) 30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_evas_log_dom, __VA_ARGS__)
31#ifdef CRIT 31#ifdef CRI
32# undef CRIT 32# undef CRI
33#endif 33#endif
34#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__) 34#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__)
35 35
36 36
37#define IDLE_FLUSH_TIME 0.5 37#define IDLE_FLUSH_TIME 0.5
diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c
index 9ec113f9a8..dffef8fd59 100644
--- a/src/lib/ecore_file/ecore_file_download.c
+++ b/src/lib/ecore_file/ecore_file_download.c
@@ -93,7 +93,7 @@ _ecore_file_download(const char *url,
93{ 93{
94 if (!url) 94 if (!url)
95 { 95 {
96 CRIT("Download URL is null"); 96 CRI("Download URL is null");
97 return EINA_FALSE; 97 return EINA_FALSE;
98 } 98 }
99 99
diff --git a/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 5a091b3b04..82f9767153 100644
--- a/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
@@ -48,10 +48,10 @@ extern int _ecore_file_log_dom;
48#endif 48#endif
49#define WRN(...) EINA_LOG_DOM_WARN(_ecore_file_log_dom, __VA_ARGS__) 49#define WRN(...) EINA_LOG_DOM_WARN(_ecore_file_log_dom, __VA_ARGS__)
50 50
51#ifdef CRIT 51#ifdef CRI
52# undef CRIT 52# undef CRI
53#endif 53#endif
54#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_file_log_dom, __VA_ARGS__) 54#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_file_log_dom, __VA_ARGS__)
55 55
56/* ecore_file_monitor */ 56/* ecore_file_monitor */
57int ecore_file_monitor_init(void); 57int ecore_file_monitor_init(void);
diff --git a/src/lib/ecore_imf/ecore_imf_private.h b/src/lib/ecore_imf/ecore_imf_private.h
index 5c62cfd291..81d71c9263 100644
--- a/src/lib/ecore_imf/ecore_imf_private.h
+++ b/src/lib/ecore_imf/ecore_imf_private.h
@@ -29,10 +29,10 @@ extern int _ecore_imf_log_dom;
29#endif 29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_imf_log_dom, __VA_ARGS__) 30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_imf_log_dom, __VA_ARGS__)
31 31
32#ifdef CRIT 32#ifdef CRI
33# undef CRIT 33# undef CRI
34#endif 34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_imf_log_dom, __VA_ARGS__) 35#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_imf_log_dom, __VA_ARGS__)
36 36
37typedef struct _Ecore_IMF_Module Ecore_IMF_Module; 37typedef struct _Ecore_IMF_Module Ecore_IMF_Module;
38typedef struct _Ecore_IMF_Func_Node Ecore_IMF_Func_Node; 38typedef struct _Ecore_IMF_Func_Node Ecore_IMF_Func_Node;
diff --git a/src/lib/ecore_input/ecore_input_private.h b/src/lib/ecore_input/ecore_input_private.h
index 5660a2024a..70af2276e7 100644
--- a/src/lib/ecore_input/ecore_input_private.h
+++ b/src/lib/ecore_input/ecore_input_private.h
@@ -29,9 +29,9 @@ extern int _ecore_input_log_dom;
29#endif 29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_log_dom, __VA_ARGS__) 30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_log_dom, __VA_ARGS__)
31 31
32#ifdef CRIT 32#ifdef CRI
33# undef CRIT 33# undef CRI
34#endif 34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_input_log_dom, __VA_ARGS__) 35#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_input_log_dom, __VA_ARGS__)
36 36
37#endif 37#endif
diff --git a/src/lib/ecore_input_evas/ecore_input_evas_private.h b/src/lib/ecore_input_evas/ecore_input_evas_private.h
index c19cfbf675..1e40313065 100644
--- a/src/lib/ecore_input_evas/ecore_input_evas_private.h
+++ b/src/lib/ecore_input_evas/ecore_input_evas_private.h
@@ -29,9 +29,9 @@ extern int _ecore_input_evas_log_dom;
29#endif 29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_evas_log_dom, __VA_ARGS__) 30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_evas_log_dom, __VA_ARGS__)
31 31
32#ifdef CRIT 32#ifdef CRI
33#undef CRIT 33#undef CRI
34#endif 34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_input_evas_log_dom, __VA_ARGS__) 35#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_input_evas_log_dom, __VA_ARGS__)
36 36
37#endif 37#endif
diff --git a/src/lib/ecore_ipc/ecore_ipc_private.h b/src/lib/ecore_ipc/ecore_ipc_private.h
index bedaab167c..6cc7ffc28a 100644
--- a/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -29,10 +29,10 @@ extern int _ecore_ipc_log_dom;
29#endif 29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_ipc_log_dom, __VA_ARGS__) 30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_ipc_log_dom, __VA_ARGS__)
31 31
32#ifdef CRIT 32#ifdef CRI
33# undef CRIT 33# undef CRI
34#endif 34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_ipc_log_dom, __VA_ARGS__) 35#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_ipc_log_dom, __VA_ARGS__)
36 36
37#define ECORE_MAGIC_IPC_SERVER 0x87786556 37#define ECORE_MAGIC_IPC_SERVER 0x87786556
38#define ECORE_MAGIC_IPC_CLIENT 0x78875665 38#define ECORE_MAGIC_IPC_CLIENT 0x78875665
diff --git a/src/lib/ecore_psl1ght/ecore_psl1ght_private.h b/src/lib/ecore_psl1ght/ecore_psl1ght_private.h
index bd5a86e2bb..b3def7955d 100644
--- a/src/lib/ecore_psl1ght/ecore_psl1ght_private.h
+++ b/src/lib/ecore_psl1ght/ecore_psl1ght_private.h
@@ -28,9 +28,9 @@ extern int _ecore_psl1ght_log_dom;
28# endif 28# endif
29# define WRN(...) EINA_LOG_DOM_WARN(_ecore_psl1ght_log_dom, __VA_ARGS__) 29# define WRN(...) EINA_LOG_DOM_WARN(_ecore_psl1ght_log_dom, __VA_ARGS__)
30 30
31# ifdef CRIT 31# ifdef CRI
32# undef CRIT 32# undef CRI
33# endif 33# endif
34# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_psl1ght_log_dom, __VA_ARGS__) 34# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_psl1ght_log_dom, __VA_ARGS__)
35 35
36#endif 36#endif
diff --git a/src/lib/ecore_sdl/ecore_sdl_private.h b/src/lib/ecore_sdl/ecore_sdl_private.h
index 37e957015d..593083a957 100644
--- a/src/lib/ecore_sdl/ecore_sdl_private.h
+++ b/src/lib/ecore_sdl/ecore_sdl_private.h
@@ -28,9 +28,9 @@ extern int _ecore_sdl_log_dom;
28# endif 28# endif
29# define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__) 29# define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__)
30 30
31# ifdef CRIT 31# ifdef CRI
32# undef CRIT 32# undef CRI
33# endif 33# endif
34# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__) 34# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__)
35 35
36#endif 36#endif
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index ecb54f0467..cca4e39cab 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -45,10 +45,10 @@ extern Ecore_Wl_Display *_ecore_wl_disp;
45# endif 45# endif
46# define WRN(...) EINA_LOG_DOM_WARN(_ecore_wl_log_dom, __VA_ARGS__) 46# define WRN(...) EINA_LOG_DOM_WARN(_ecore_wl_log_dom, __VA_ARGS__)
47 47
48# ifdef CRIT 48# ifdef CRI
49# undef CRIT 49# undef CRI
50# endif 50# endif
51# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__) 51# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_wl_log_dom, __VA_ARGS__)
52 52
53 53
54struct _Ecore_Wl_Display 54struct _Ecore_Wl_Display
diff --git a/src/lib/ecore_x/xcb/ecore_xcb.c b/src/lib/ecore_x/xcb/ecore_xcb.c
index 00e38d3cb6..61c1a3002a 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb.c
@@ -203,7 +203,7 @@ ecore_x_init(const char *name)
203 203
204 if (xcb_connection_has_error(_ecore_xcb_conn)) 204 if (xcb_connection_has_error(_ecore_xcb_conn))
205 { 205 {
206 CRIT("XCB Connection has error"); 206 CRI("XCB Connection has error");
207 eina_log_domain_unregister(_ecore_xcb_log_dom); 207 eina_log_domain_unregister(_ecore_xcb_log_dom);
208 _ecore_xcb_log_dom = -1; 208 _ecore_xcb_log_dom = -1;
209 ecore_event_shutdown(); 209 ecore_event_shutdown();
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_error.c b/src/lib/ecore_x/xcb/ecore_xcb_error.c
index 5c79e4c27d..166d5ee145 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_error.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_error.c
@@ -100,11 +100,11 @@ _ecore_xcb_error_handle(xcb_generic_error_t *err)
100int 100int
101_ecore_xcb_io_error_handle(xcb_generic_error_t *err) 101_ecore_xcb_io_error_handle(xcb_generic_error_t *err)
102{ 102{
103 CRIT("IO Error:"); 103 CRI("IO Error:");
104 if (err) 104 if (err)
105 { 105 {
106 CRIT("\tRequest: %d", err->sequence); 106 CRI("\tRequest: %d", err->sequence);
107 CRIT("\tCode: %d", err->error_code); 107 CRI("\tCode: %d", err->error_code);
108 } 108 }
109 if (_io_error_func) 109 if (_io_error_func)
110 _io_error_func(_io_error_data); 110 _io_error_func(_io_error_data);
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_private.h b/src/lib/ecore_x/xcb/ecore_xcb_private.h
index d40fa3b4aa..d578a975ca 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -57,10 +57,10 @@ extern int _ecore_xcb_log_dom;
57# endif 57# endif
58# define WRN(...) EINA_LOG_DOM_WARN(_ecore_xcb_log_dom, __VA_ARGS__) 58# define WRN(...) EINA_LOG_DOM_WARN(_ecore_xcb_log_dom, __VA_ARGS__)
59 59
60# ifdef CRIT 60# ifdef CRI
61# undef CRIT 61# undef CRI
62# endif 62# endif
63# define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_xcb_log_dom, __VA_ARGS__) 63# define CRI(...) EINA_LOG_DOM_CRIT(_ecore_xcb_log_dom, __VA_ARGS__)
64 64
65# ifdef LOGFNS 65# ifdef LOGFNS
66# include <stdio.h> 66# include <stdio.h>
diff --git a/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h
index 870727bb57..815e081238 100644
--- a/src/lib/ecore_x/xlib/ecore_x_private.h
+++ b/src/lib/ecore_x/xlib/ecore_x_private.h
@@ -93,10 +93,10 @@ extern Eina_Bool _ecore_xlib_sync;
93#endif /* ifdef WRN */ 93#endif /* ifdef WRN */
94#define WRN(...) EINA_LOG_DOM_WARN(_ecore_xlib_log_dom, __VA_ARGS__) 94#define WRN(...) EINA_LOG_DOM_WARN(_ecore_xlib_log_dom, __VA_ARGS__)
95 95
96#ifdef CRIT 96#ifdef CRI
97# undef CRIT 97# undef CRI
98#endif /* ifdef CRIT */ 98#endif /* ifdef CRI */
99#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_xlib_log_dom, __VA_ARGS__) 99#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_xlib_log_dom, __VA_ARGS__)
100 100
101typedef struct _Ecore_X_Selection_Intern Ecore_X_Selection_Intern; 101typedef struct _Ecore_X_Selection_Intern Ecore_X_Selection_Intern;
102 102
diff --git a/src/lib/edje/edje_convert.c b/src/lib/edje/edje_convert.c
index f68df6f8ea..2f923e1923 100644
--- a/src/lib/edje/edje_convert.c
+++ b/src/lib/edje/edje_convert.c
@@ -37,15 +37,15 @@ _edje_collection_string_free(void *data)
37 edf = (Edje_File*) _edje_file_get(); 37 edf = (Edje_File*) _edje_file_get();
38 38
39 if (!edf->warning) 39 if (!edf->warning)
40 CRITICAL("This program as probably called edje_shutdown() with " 40 CRI("This program as probably called edje_shutdown() with "
41 "active Edje objects still around. " 41 "active Edje objects still around. "
42 "This can cause problems as both Evas and Edje retain " 42 "This can cause problems as both Evas and Edje retain "
43 "references to the objects. " 43 "references to the objects. "
44 "You should shut down all canvases and objects " 44 "You should shut down all canvases and objects "
45 "before calling edje_shutdown(). " 45 "before calling edje_shutdown(). "
46 "The following errors are the edje object files and " 46 "The following errors are the edje object files and "
47 "parts that are still hanging around, with their reference " 47 "parts that are still hanging around, with their reference "
48 "counts"); 48 "counts");
49 49
50 edf->warning = 1; 50 edf->warning = 1;
51 ERR("file: '%s', references: %i, part: '%s', references: %i", 51 ERR("file: '%s', references: %i, part: '%s', references: %i",
diff --git a/src/lib/edje/edje_lua.c b/src/lib/edje/edje_lua.c
index 339f0ad6d5..6fb6b2e91f 100644
--- a/src/lib/edje/edje_lua.c
+++ b/src/lib/edje/edje_lua.c
@@ -120,7 +120,7 @@ jmp_buf _edje_lua_panic_jmp;
120static int 120static int
121_edje_lua_custom_panic(EINA_UNUSED lua_State *L) 121_edje_lua_custom_panic(EINA_UNUSED lua_State *L)
122{ 122{
123 CRITICAL("PANIC"); 123 CRI("PANIC");
124 longjmp(_edje_lua_panic_jmp, 1); 124 longjmp(_edje_lua_panic_jmp, 1);
125 return 1; /* longjmp() never returns, but this keep gcc happy */ 125 return 1; /* longjmp() never returns, but this keep gcc happy */
126} 126}
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 73731da23a..5c5896114a 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -77,10 +77,10 @@ EAPI extern int _edje_default_log_dom ;
77# undef WRN 77# undef WRN
78#endif 78#endif
79#define WRN(...) EINA_LOG_DOM_WARN(_edje_default_log_dom, __VA_ARGS__) 79#define WRN(...) EINA_LOG_DOM_WARN(_edje_default_log_dom, __VA_ARGS__)
80#ifdef CRIT 80#ifdef CRI
81# undef CRIT 81# undef CRI
82#endif 82#endif
83#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__) 83#define CRI(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__)
84#ifdef DBG 84#ifdef DBG
85# undef DBG 85# undef DBG
86#endif 86#endif
diff --git a/src/lib/eet/Eet_private.h b/src/lib/eet/Eet_private.h
index 5d57c0172a..a915cb7717 100644
--- a/src/lib/eet/Eet_private.h
+++ b/src/lib/eet/Eet_private.h
@@ -219,10 +219,10 @@ extern int _eet_log_dom_global;
219# undef WRN 219# undef WRN
220#endif /* ifdef WRN */ 220#endif /* ifdef WRN */
221#define WRN(...) EINA_LOG_DOM_WARN(_eet_log_dom_global, __VA_ARGS__) 221#define WRN(...) EINA_LOG_DOM_WARN(_eet_log_dom_global, __VA_ARGS__)
222#ifdef CRIT 222#ifdef CRI
223# undef CRIT 223# undef CRI
224#endif /* ifdef CRIT */ 224#endif /* ifdef CRI */
225#define CRIT(...) EINA_LOG_DOM_CRIT(_eet_log_dom_global, __VA_ARGS__) 225#define CRI(...) EINA_LOG_DOM_CRIT(_eet_log_dom_global, __VA_ARGS__)
226 226
227Eet_Dictionary * 227Eet_Dictionary *
228 eet_dictionary_add(void); 228 eet_dictionary_add(void);
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c
index cd81695825..2afdbf5320 100644
--- a/src/lib/eet/eet_data.c
+++ b/src/lib/eet/eet_data.c
@@ -2133,30 +2133,30 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
2133 if (type < EET_T_UNKNOW || 2133 if (type < EET_T_UNKNOW ||
2134 type >= EET_T_LAST) 2134 type >= EET_T_LAST)
2135 { 2135 {
2136 CRIT("Preventing later bug due to unknow type: %i", type); 2136 CRI("Preventing later bug due to unknow type: %i", type);
2137 return; 2137 return;
2138 } 2138 }
2139 if (offset < 0) 2139 if (offset < 0)
2140 { 2140 {
2141 CRIT("Preventing later buffer underrun : offset = %i", offset); 2141 CRI("Preventing later buffer underrun : offset = %i", offset);
2142 return; 2142 return;
2143 } 2143 }
2144 if (offset > edd->size) 2144 if (offset > edd->size)
2145 { 2145 {
2146 CRIT("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size); 2146 CRI("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size);
2147 return; 2147 return;
2148 } 2148 }
2149 if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW) 2149 if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW)
2150 { 2150 {
2151 if (offset + eet_basic_codec[type - 1].size > edd->size) 2151 if (offset + eet_basic_codec[type - 1].size > edd->size)
2152 { 2152 {
2153 CRIT("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size); 2153 CRI("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size);
2154 return; 2154 return;
2155 } 2155 }
2156 } 2156 }
2157 else if ((offset + sizeof (void*)) > (unsigned int) edd->size) 2157 else if ((offset + sizeof (void*)) > (unsigned int) edd->size)
2158 { 2158 {
2159 CRIT("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size); 2159 CRI("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size);
2160 return; 2160 return;
2161 } 2161 }
2162 2162
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index 3ad086634a..804ed0eec9 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -234,7 +234,7 @@ eet_cache_add(Eet_File *ef,
234 new_cache = realloc(new_cache, new_cache_alloc * sizeof(Eet_File *)); 234 new_cache = realloc(new_cache, new_cache_alloc * sizeof(Eet_File *));
235 if (!new_cache) 235 if (!new_cache)
236 { 236 {
237 CRIT("BAD ERROR! Eet realloc of cache list failed. Abort"); 237 CRI("BAD ERROR! Eet realloc of cache list failed. Abort");
238 abort(); 238 abort();
239 } 239 }
240 } 240 }
@@ -284,7 +284,7 @@ eet_cache_del(Eet_File *ef,
284 new_cache = realloc(new_cache, new_cache_alloc * sizeof(Eet_File *)); 284 new_cache = realloc(new_cache, new_cache_alloc * sizeof(Eet_File *));
285 if (!new_cache) 285 if (!new_cache)
286 { 286 {
287 CRIT("BAD ERROR! Eet realloc of cache list failed. Abort"); 287 CRI("BAD ERROR! Eet realloc of cache list failed. Abort");
288 abort(); 288 abort();
289 } 289 }
290 } 290 }
@@ -2825,7 +2825,7 @@ _eet_entries_iterator_free(Eet_Entries_Iterator *it)
2825{ 2825{
2826 if (it->locked) 2826 if (it->locked)
2827 { 2827 {
2828 CRIT("Iterator still LOCKED !"); 2828 CRI("Iterator still LOCKED !");
2829 UNLOCK_FILE(it->ef); 2829 UNLOCK_FILE(it->ef);
2830 } 2830 }
2831} 2831}
@@ -2835,7 +2835,7 @@ _eet_entries_iterator_lock(Eet_Entries_Iterator *it)
2835{ 2835{
2836 if (it->locked) 2836 if (it->locked)
2837 { 2837 {
2838 CRIT("Iterator already LOCKED !"); 2838 CRI("Iterator already LOCKED !");
2839 return EINA_TRUE; 2839 return EINA_TRUE;
2840 } 2840 }
2841 2841
@@ -2849,7 +2849,7 @@ _eet_entries_iterator_unlock(Eet_Entries_Iterator *it)
2849{ 2849{
2850 if (!it->locked) 2850 if (!it->locked)
2851 { 2851 {
2852 CRIT("Iterator already UNLOCKED !"); 2852 CRI("Iterator already UNLOCKED !");
2853 return EINA_TRUE; 2853 return EINA_TRUE;
2854 } 2854 }
2855 2855
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index 7c68751368..1c467d27b3 100644
--- a/src/lib/efreet/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
@@ -324,20 +324,20 @@ efreet_dirs_init(void)
324 { 324 {
325 if (chmod(xdg_runtime_dir, 0700) < 0) 325 if (chmod(xdg_runtime_dir, 0700) < 0)
326 { 326 {
327 CRITICAL("Cannot set XDG_RUNTIME_DIR=%s to mode 0700: %s", 327 CRI("Cannot set XDG_RUNTIME_DIR=%s to mode 0700: %s",
328 xdg_runtime_dir, strerror(errno)); 328 xdg_runtime_dir, strerror(errno));
329 eina_stringshare_replace(&xdg_runtime_dir, NULL); 329 eina_stringshare_replace(&xdg_runtime_dir, NULL);
330 } 330 }
331 } 331 }
332 else 332 else
333 { 333 {
334 CRITICAL("Failed to create XDG_RUNTIME_DIR=%s", xdg_runtime_dir); 334 CRI("Failed to create XDG_RUNTIME_DIR=%s", xdg_runtime_dir);
335 eina_stringshare_replace(&xdg_runtime_dir, NULL); 335 eina_stringshare_replace(&xdg_runtime_dir, NULL);
336 } 336 }
337 } 337 }
338 else if (!S_ISDIR(st.st_mode)) 338 else if (!S_ISDIR(st.st_mode))
339 { 339 {
340 CRITICAL("XDG_RUNTIME_DIR=%s is not a directory!", xdg_runtime_dir); 340 CRI("XDG_RUNTIME_DIR=%s is not a directory!", xdg_runtime_dir);
341 eina_stringshare_replace(&xdg_runtime_dir, NULL); 341 eina_stringshare_replace(&xdg_runtime_dir, NULL);
342 } 342 }
343 else if ((st.st_mode & 0777) != 0700) 343 else if ((st.st_mode & 0777) != 0700)
@@ -350,7 +350,7 @@ efreet_dirs_init(void)
350 xdg_runtime_dir, st.st_mode & 0777); 350 xdg_runtime_dir, st.st_mode & 0777);
351 if (chmod(xdg_runtime_dir, 0700) != 0) 351 if (chmod(xdg_runtime_dir, 0700) != 0)
352 { 352 {
353 CRITICAL("Cannot fix XDG_RUNTIME_DIR=%s incorrect mode %o: %s", 353 CRI("Cannot fix XDG_RUNTIME_DIR=%s incorrect mode %o: %s",
354 xdg_runtime_dir, st.st_mode & 0777, strerror(errno)); 354 xdg_runtime_dir, st.st_mode & 0777, strerror(errno));
355 eina_stringshare_replace(&xdg_runtime_dir, NULL); 355 eina_stringshare_replace(&xdg_runtime_dir, NULL);
356 } 356 }
diff --git a/src/lib/efreet/efreet_private.h b/src/lib/efreet/efreet_private.h
index 3863596c94..21f75173be 100644
--- a/src/lib/efreet/efreet_private.h
+++ b/src/lib/efreet/efreet_private.h
@@ -91,10 +91,10 @@
91 * four macros are defined ERR, WRN, DGB, INF. 91 * four macros are defined ERR, WRN, DGB, INF.
92 * EFREET_MODULE_LOG_DOM should be defined individually for each module 92 * EFREET_MODULE_LOG_DOM should be defined individually for each module
93 */ 93 */
94#ifdef CRITICAL 94#ifdef CRI
95#undef CRITICAL 95#undef CRI
96#endif 96#endif
97#define CRITICAL(...) EINA_LOG_DOM_CRIT(EFREET_MODULE_LOG_DOM, __VA_ARGS__) 97#define CRI(...) EINA_LOG_DOM_CRIT(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
98#ifdef ERR 98#ifdef ERR
99#undef ERR 99#undef ERR
100#endif 100#endif
diff --git a/src/lib/eina/eina_binshare.c b/src/lib/eina/eina_binshare.c
index 01e8046e01..65edf841a4 100644
--- a/src/lib/eina/eina_binshare.c
+++ b/src/lib/eina/eina_binshare.c
@@ -43,10 +43,10 @@
43 * @cond LOCAL 43 * @cond LOCAL
44 */ 44 */
45 45
46#ifdef CRITICAL 46#ifdef CRI
47#undef CRITICAL 47#undef CRI
48#endif 48#endif
49#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_binshare_log_dom, __VA_ARGS__) 49#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_binshare_log_dom, __VA_ARGS__)
50 50
51#ifdef ERR 51#ifdef ERR
52#undef ERR 52#undef ERR
@@ -151,7 +151,7 @@ eina_binshare_del(const void *obj)
151 return; 151 return;
152 152
153 if (!eina_share_common_del(binshare_share, obj)) 153 if (!eina_share_common_del(binshare_share, obj))
154 CRITICAL("EEEK trying to del non-shared binshare %p", obj); 154 CRI("EEEK trying to del non-shared binshare %p", obj);
155} 155}
156 156
157EAPI const void * 157EAPI const void *
diff --git a/src/lib/eina/eina_model.c b/src/lib/eina/eina_model.c
index e1931fdc68..99380e2e66 100644
--- a/src/lib/eina/eina_model.c
+++ b/src/lib/eina/eina_model.c
@@ -76,10 +76,10 @@ static const char _eina_model_str_properties_unloaded[] = "properties,unloaded";
76static const char _eina_model_str_children_loaded[] = "children,loaded"; 76static const char _eina_model_str_children_loaded[] = "children,loaded";
77static const char _eina_model_str_children_unloaded[] = "children,unloaded"; 77static const char _eina_model_str_children_unloaded[] = "children,unloaded";
78 78
79#ifdef CRITICAL 79#ifdef CRI
80#undef CRITICAL 80#undef CRI
81#endif 81#endif
82#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_model_log_dom, __VA_ARGS__) 82#define CRI(...) EINA_LOG_DOM_CRIT(_eina_model_log_dom, __VA_ARGS__)
83 83
84#ifdef ERR 84#ifdef ERR
85#undef ERR 85#undef ERR
@@ -362,25 +362,25 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
362 { 362 {
363 if (itr->version != EINA_MODEL_TYPE_VERSION) 363 if (itr->version != EINA_MODEL_TYPE_VERSION)
364 { 364 {
365 CRITICAL("Type %p version is %u, expected %u instead.", 365 CRI("Type %p version is %u, expected %u instead.",
366 itr, itr->version, EINA_MODEL_TYPE_VERSION); 366 itr, itr->version, EINA_MODEL_TYPE_VERSION);
367 return EINA_FALSE; 367 return EINA_FALSE;
368 } 368 }
369 if (!itr->name) 369 if (!itr->name)
370 { 370 {
371 CRITICAL("Type %p provides no name!", itr); 371 CRI("Type %p provides no name!", itr);
372 return EINA_FALSE; 372 return EINA_FALSE;
373 } 373 }
374 if (itr->type_size < sizeof(Eina_Model_Type)) 374 if (itr->type_size < sizeof(Eina_Model_Type))
375 { 375 {
376 CRITICAL("Type %p %s size must be >= sizeof(Eina_Model_Type)!", 376 CRI("Type %p %s size must be >= sizeof(Eina_Model_Type)!",
377 itr, itr->name); 377 itr, itr->name);
378 return EINA_FALSE; 378 return EINA_FALSE;
379 } 379 }
380 if (child_size == 0) child_size = itr->type_size; 380 if (child_size == 0) child_size = itr->type_size;
381 else if (child_size < itr->type_size) 381 else if (child_size < itr->type_size)
382 { 382 {
383 CRITICAL("Type %p %s size is bigger than its child type %p %s!", 383 CRI("Type %p %s size is bigger than its child type %p %s!",
384 itr, itr->name, last_itr, last_itr->name); 384 itr, itr->name, last_itr, last_itr->name);
385 return EINA_FALSE; 385 return EINA_FALSE;
386 } 386 }
@@ -418,7 +418,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
418 418
419 if ((!itr->parent) && (itr != EINA_MODEL_TYPE_BASE)) 419 if ((!itr->parent) && (itr != EINA_MODEL_TYPE_BASE))
420 { 420 {
421 CRITICAL("Type %p (%s) does not inherit from EINA_MODEL_TYPE_BASE!", 421 CRI("Type %p (%s) does not inherit from EINA_MODEL_TYPE_BASE!",
422 type, type->name); 422 type, type->name);
423 return EINA_FALSE; 423 return EINA_FALSE;
424 } 424 }
@@ -427,7 +427,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
427#define CK_METH(meth) \ 427#define CK_METH(meth) \
428 if (!desc->ops.type.meth) \ 428 if (!desc->ops.type.meth) \
429 { \ 429 { \
430 CRITICAL("Mandatory method "#meth \ 430 CRI("Mandatory method "#meth \
431 "() was not provided by type %p (%s).", \ 431 "() was not provided by type %p (%s).", \
432 type, type->name); \ 432 type, type->name); \
433 return EINA_FALSE; \ 433 return EINA_FALSE; \
@@ -448,7 +448,7 @@ _eina_model_description_type_fill(Eina_Model_Description *desc, const Eina_Model
448 448
449 if (ext_size % sizeof(void *) != 0) 449 if (ext_size % sizeof(void *) != 0)
450 { 450 {
451 CRITICAL("Extension size %u is not multiple of sizeof(void*)", 451 CRI("Extension size %u is not multiple of sizeof(void*)",
452 ext_size); 452 ext_size);
453 return EINA_FALSE; 453 return EINA_FALSE;
454 } 454 }
@@ -632,7 +632,7 @@ _eina_model_description_ifaces_fix(Eina_Model_Description *desc)
632 for (i = 0; i < n_pending; i++) 632 for (i = 0; i < n_pending; i++)
633 ERR("%p (%s) is part of dependency loop!", 633 ERR("%p (%s) is part of dependency loop!",
634 pending[i]->iface, pending[i]->iface->name); 634 pending[i]->iface, pending[i]->iface->name);
635 CRITICAL("Cannot use type %p (%s) with broken interfaces!", 635 CRI("Cannot use type %p (%s) with broken interfaces!",
636 desc->cache.types[0], desc->cache.types[0]->name); 636 desc->cache.types[0], desc->cache.types[0]->name);
637 free(desc->cache.ifaces); 637 free(desc->cache.ifaces);
638 ret = EINA_FALSE; 638 ret = EINA_FALSE;
@@ -650,14 +650,14 @@ _eina_model_description_ifaces_validate_and_count(const Eina_Model_Interface *if
650{ 650{
651 if (iface->version != EINA_MODEL_INTERFACE_VERSION) 651 if (iface->version != EINA_MODEL_INTERFACE_VERSION)
652 { 652 {
653 CRITICAL("Interface %p version is %u, expected %u instead.", 653 CRI("Interface %p version is %u, expected %u instead.",
654 iface, iface->version, EINA_MODEL_INTERFACE_VERSION); 654 iface, iface->version, EINA_MODEL_INTERFACE_VERSION);
655 return EINA_FALSE; 655 return EINA_FALSE;
656 } 656 }
657 657
658 if (!iface->name) 658 if (!iface->name)
659 { 659 {
660 CRITICAL("Interface %p provides no name!", iface); 660 CRI("Interface %p provides no name!", iface);
661 return EINA_FALSE; 661 return EINA_FALSE;
662 } 662 }
663 663
@@ -3444,7 +3444,7 @@ _eina_model_unref(Eina_Model *model)
3444 { \ 3444 { \
3445 if (model->desc->ops.type.method) \ 3445 if (model->desc->ops.type.method) \
3446 return model->desc->ops.type.method(model, ## __VA_ARGS__); \ 3446 return model->desc->ops.type.method(model, ## __VA_ARGS__); \
3447 CRITICAL("Mandatory method" # method "() not implemented for model %p (%s)", \ 3447 CRI("Mandatory method" # method "() not implemented for model %p (%s)", \
3448 model, model->desc->cache.types[0]->name); \ 3448 model, model->desc->cache.types[0]->name); \
3449 return def_retval; \ 3449 return def_retval; \
3450 } \ 3450 } \
@@ -3457,7 +3457,7 @@ _eina_model_unref(Eina_Model *model)
3457 model->desc->ops.type.method(model, ## __VA_ARGS__); \ 3457 model->desc->ops.type.method(model, ## __VA_ARGS__); \
3458 else \ 3458 else \
3459 { \ 3459 { \
3460 CRITICAL("Mandatory method" # method "() not implemented for model %p (%s)", \ 3460 CRI("Mandatory method" # method "() not implemented for model %p (%s)", \
3461 model, model->desc->cache.types[0]->name); \ 3461 model, model->desc->cache.types[0]->name); \
3462 } \ 3462 } \
3463 } \ 3463 } \
@@ -4899,7 +4899,7 @@ eina_model_type_private_data_get(const Eina_Model *model, const Eina_Model_Type
4899 if (desc->cache.types[i] == type) 4899 if (desc->cache.types[i] == type)
4900 return model->privates[i]; 4900 return model->privates[i];
4901 4901
4902 CRITICAL("Model %p (%s) is not an instance of type %p (%s)", 4902 CRI("Model %p (%s) is not an instance of type %p (%s)",
4903 model, desc->cache.types[0]->name, 4903 model, desc->cache.types[0]->name,
4904 type, type->name); 4904 type, type->name);
4905 return NULL; 4905 return NULL;
@@ -4964,7 +4964,7 @@ eina_model_interface_private_data_get(const Eina_Model *model, const Eina_Model_
4964 if (desc->cache.ifaces[i] == iface) 4964 if (desc->cache.ifaces[i] == iface)
4965 return model->privates[desc->total.types + i]; 4965 return model->privates[desc->total.types + i];
4966 4966
4967 CRITICAL("Model %p (%s) does not implement interface %p (%s)", 4967 CRI("Model %p (%s) does not implement interface %p (%s)",
4968 model, desc->cache.types[0]->name, 4968 model, desc->cache.types[0]->name,
4969 iface, iface->name); 4969 iface, iface->name);
4970 return NULL; 4970 return NULL;
diff --git a/src/lib/eina/eina_stringshare.c b/src/lib/eina/eina_stringshare.c
index 36af6d460a..88126ffcd7 100644
--- a/src/lib/eina/eina_stringshare.c
+++ b/src/lib/eina/eina_stringshare.c
@@ -46,10 +46,10 @@
46#include "eina_stringshare.h" 46#include "eina_stringshare.h"
47 47
48 48
49#ifdef CRITICAL 49#ifdef CRI
50#undef CRITICAL 50#undef CRI
51#endif 51#endif
52#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_stringshare_log_dom, __VA_ARGS__) 52#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_stringshare_log_dom, __VA_ARGS__)
53 53
54#ifdef ERR 54#ifdef ERR
55#undef ERR 55#undef ERR
@@ -366,7 +366,7 @@ _eina_stringshare_small_del(const char *str, unsigned char length)
366 return; 366 return;
367 367
368error: 368error:
369 CRITICAL("EEEK trying to del non-shared stringshare \"%s\"", str); 369 CRI("EEEK trying to del non-shared stringshare \"%s\"", str);
370} 370}
371 371
372static void 372static void
@@ -570,7 +570,7 @@ eina_stringshare_del(Eina_Stringshare *str)
570 } 570 }
571 571
572 if (!eina_share_common_del(stringshare_share, str)) 572 if (!eina_share_common_del(stringshare_share, str))
573 CRITICAL("EEEK trying to del non-shared stringshare \"%s\"", str); 573 CRI("EEEK trying to del non-shared stringshare \"%s\"", str);
574} 574}
575 575
576EAPI Eina_Stringshare * 576EAPI Eina_Stringshare *
diff --git a/src/lib/eina/eina_ustringshare.c b/src/lib/eina/eina_ustringshare.c
index 33be24216c..dbdc8a707b 100644
--- a/src/lib/eina/eina_ustringshare.c
+++ b/src/lib/eina/eina_ustringshare.c
@@ -42,10 +42,10 @@
42#include "eina_ustringshare.h" 42#include "eina_ustringshare.h"
43 43
44 44
45#ifdef CRITICAL 45#ifdef CRI
46#undef CRITICAL 46#undef CRI
47#endif 47#endif
48#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eina_share_ustringshare_log_dom, __VA_ARGS__) 48#define CRI(...) EINA_LOG_DOM_CRIT(_eina_share_ustringshare_log_dom, __VA_ARGS__)
49 49
50#ifdef ERR 50#ifdef ERR
51#undef ERR 51#undef ERR
@@ -145,7 +145,7 @@ eina_ustringshare_del(const Eina_Unicode *str)
145 return; 145 return;
146 146
147 if (!eina_share_common_del(ustringshare_share, (const char *)str)) 147 if (!eina_share_common_del(ustringshare_share, (const char *)str))
148 CRITICAL("EEEK trying to del non-shared ustringshare \"%s\"", (const char *)str); 148 CRI("EEEK trying to del non-shared ustringshare \"%s\"", (const char *)str);
149} 149}
150 150
151EAPI const Eina_Unicode * 151EAPI const Eina_Unicode *
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index 603b097c97..b030446751 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -99,10 +99,10 @@ extern int _eio_log_dom_global;
99# undef WRN 99# undef WRN
100#endif /* ifdef WRN */ 100#endif /* ifdef WRN */
101#define WRN(...) EINA_LOG_DOM_WARN(_eio_log_dom_global, __VA_ARGS__) 101#define WRN(...) EINA_LOG_DOM_WARN(_eio_log_dom_global, __VA_ARGS__)
102#ifdef CRIT 102#ifdef CRI
103# undef CRIT 103# undef CRI
104#endif /* ifdef CRIT */ 104#endif /* ifdef CRI */
105#define CRIT(...) EINA_LOG_DOM_CRIT(_eio_log_dom_global, __VA_ARGS__) 105#define CRI(...) EINA_LOG_DOM_CRIT(_eio_log_dom_global, __VA_ARGS__)
106 106
107typedef struct _Eio_Eet_Open Eio_Eet_Open; 107typedef struct _Eio_Eet_Open Eio_Eet_Open;
108typedef struct _Eio_Eet_Simple Eio_Eet_Simple; 108typedef struct _Eio_Eet_Simple Eio_Eet_Simple;
diff --git a/src/lib/eldbus/eldbus_core.c b/src/lib/eldbus/eldbus_core.c
index 29fd2f3bd1..71ee4e4c29 100644
--- a/src/lib/eldbus/eldbus_core.c
+++ b/src/lib/eldbus/eldbus_core.c
@@ -204,17 +204,17 @@ eldbus_shutdown(void)
204 204
205 if (shared_connections[ELDBUS_CONNECTION_TYPE_SESSION - 1]) 205 if (shared_connections[ELDBUS_CONNECTION_TYPE_SESSION - 1])
206 { 206 {
207 CRITICAL("Alive TYPE_SESSION connection"); 207 CRI("Alive TYPE_SESSION connection");
208 print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_SESSION - 1]); 208 print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_SESSION - 1]);
209 } 209 }
210 if (shared_connections[ELDBUS_CONNECTION_TYPE_SYSTEM - 1]) 210 if (shared_connections[ELDBUS_CONNECTION_TYPE_SYSTEM - 1])
211 { 211 {
212 CRITICAL("Alive TYPE_SYSTEM connection"); 212 CRI("Alive TYPE_SYSTEM connection");
213 print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_SYSTEM - 1]); 213 print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_SYSTEM - 1]);
214 } 214 }
215 if (shared_connections[ELDBUS_CONNECTION_TYPE_STARTER - 1]) 215 if (shared_connections[ELDBUS_CONNECTION_TYPE_STARTER - 1])
216 { 216 {
217 CRITICAL("Alive TYPE_STARTER connection"); 217 CRI("Alive TYPE_STARTER connection");
218 print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_STARTER - 1]); 218 print_live_connection(shared_connections[ELDBUS_CONNECTION_TYPE_STARTER - 1]);
219 } 219 }
220 if (shared_connections[ELDBUS_CONNECTION_TYPE_ADDRESS - 1]) 220 if (shared_connections[ELDBUS_CONNECTION_TYPE_ADDRESS - 1])
@@ -227,7 +227,7 @@ eldbus_shutdown(void)
227 it = eina_hash_iterator_tuple_new(address_connections); 227 it = eina_hash_iterator_tuple_new(address_connections);
228 EINA_ITERATOR_FOREACH(it, tuple) 228 EINA_ITERATOR_FOREACH(it, tuple)
229 { 229 {
230 CRITICAL("Alive TYPE_ADDRESS connection: %s", (char*)tuple->key); 230 CRI("Alive TYPE_ADDRESS connection: %s", (char*)tuple->key);
231 print_live_connection(tuple->data); 231 print_live_connection(tuple->data);
232 } 232 }
233 eina_iterator_free(it); 233 eina_iterator_free(it);
@@ -1180,7 +1180,7 @@ _eldbus_connection_free(Eldbus_Connection *conn)
1180 1180
1181 if (conn->pendings) 1181 if (conn->pendings)
1182 { 1182 {
1183 CRITICAL("Connection %p released with live pending calls!", 1183 CRI("Connection %p released with live pending calls!",
1184 conn); 1184 conn);
1185 EINA_INLIST_FOREACH(conn->pendings, p) 1185 EINA_INLIST_FOREACH(conn->pendings, p)
1186 ERR("conn=%p alive pending call=%p dest=%s path=%s %s.%s()", conn, p, 1186 ERR("conn=%p alive pending call=%p dest=%s path=%s %s.%s()", conn, p,
@@ -1192,7 +1192,7 @@ _eldbus_connection_free(Eldbus_Connection *conn)
1192 1192
1193 if (conn->signal_handlers) 1193 if (conn->signal_handlers)
1194 { 1194 {
1195 CRITICAL("Connection %p released with live signal handlers!", conn); 1195 CRI("Connection %p released with live signal handlers!", conn);
1196 EINA_INLIST_FOREACH(conn->signal_handlers, h) 1196 EINA_INLIST_FOREACH(conn->signal_handlers, h)
1197 ERR("conn=%p alive signal=%p %s.%s path=%s", conn, h, h->interface, 1197 ERR("conn=%p alive signal=%p %s.%s path=%s", conn, h, h->interface,
1198 h->member, h->path); 1198 h->member, h->path);
diff --git a/src/lib/eldbus/eldbus_object.c b/src/lib/eldbus/eldbus_object.c
index faef28f996..64047e622d 100644
--- a/src/lib/eldbus/eldbus_object.c
+++ b/src/lib/eldbus/eldbus_object.c
@@ -146,7 +146,7 @@ _eldbus_object_free(Eldbus_Object *obj)
146 } 146 }
147 147
148 if (obj->pendings) 148 if (obj->pendings)
149 CRITICAL("Object %p released with live pending calls!", obj); 149 CRI("Object %p released with live pending calls!", obj);
150 150
151 for (i = 0; i < ELDBUS_OBJECT_EVENT_LAST; i++) 151 for (i = 0; i < ELDBUS_OBJECT_EVENT_LAST; i++)
152 { 152 {
diff --git a/src/lib/eldbus/eldbus_private.h b/src/lib/eldbus/eldbus_private.h
index c17e44335b..57aaa883a0 100644
--- a/src/lib/eldbus/eldbus_private.h
+++ b/src/lib/eldbus/eldbus_private.h
@@ -13,7 +13,7 @@ extern int _eldbus_log_dom;
13#define INF(...) EINA_LOG_DOM_INFO(_eldbus_log_dom, __VA_ARGS__) 13#define INF(...) EINA_LOG_DOM_INFO(_eldbus_log_dom, __VA_ARGS__)
14#define WRN(...) EINA_LOG_DOM_WARN(_eldbus_log_dom, __VA_ARGS__) 14#define WRN(...) EINA_LOG_DOM_WARN(_eldbus_log_dom, __VA_ARGS__)
15#define ERR(...) EINA_LOG_DOM_ERR(_eldbus_log_dom, __VA_ARGS__) 15#define ERR(...) EINA_LOG_DOM_ERR(_eldbus_log_dom, __VA_ARGS__)
16#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eldbus_log_dom, __VA_ARGS__) 16#define CRI(...) EINA_LOG_DOM_CRIT(_eldbus_log_dom, __VA_ARGS__)
17 17
18#define ELDBUS_CONNECTION_MAGIC (0xdb050001) 18#define ELDBUS_CONNECTION_MAGIC (0xdb050001)
19#define ELDBUS_MESSAGE_MAGIC (0xdb050002) 19#define ELDBUS_MESSAGE_MAGIC (0xdb050002)
diff --git a/src/lib/eldbus/eldbus_proxy.c b/src/lib/eldbus/eldbus_proxy.c
index fcd553aa97..bcb8d2e3ba 100644
--- a/src/lib/eldbus/eldbus_proxy.c
+++ b/src/lib/eldbus/eldbus_proxy.c
@@ -168,7 +168,7 @@ _eldbus_proxy_free(Eldbus_Proxy *proxy)
168 } 168 }
169 169
170 if (proxy->pendings) 170 if (proxy->pendings)
171 CRITICAL("Proxy %p released with live pending calls!", proxy); 171 CRI("Proxy %p released with live pending calls!", proxy);
172 172
173 for (i = 0; i < ELDBUS_PROXY_EVENT_LAST; i++) 173 for (i = 0; i < ELDBUS_PROXY_EVENT_LAST; i++)
174 { 174 {
diff --git a/src/lib/emotion/emotion_private.h b/src/lib/emotion/emotion_private.h
index b76ac2fce7..e50a2a8753 100644
--- a/src/lib/emotion/emotion_private.h
+++ b/src/lib/emotion/emotion_private.h
@@ -19,7 +19,7 @@ extern Eina_Prefix *_emotion_pfx;
19#define INF(...) EINA_LOG_DOM_INFO(_emotion_log_domain, __VA_ARGS__) 19#define INF(...) EINA_LOG_DOM_INFO(_emotion_log_domain, __VA_ARGS__)
20#define WRN(...) EINA_LOG_DOM_WARN(_emotion_log_domain, __VA_ARGS__) 20#define WRN(...) EINA_LOG_DOM_WARN(_emotion_log_domain, __VA_ARGS__)
21#define ERR(...) EINA_LOG_DOM_ERR(_emotion_log_domain, __VA_ARGS__) 21#define ERR(...) EINA_LOG_DOM_ERR(_emotion_log_domain, __VA_ARGS__)
22#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_log_domain, __VA_ARGS__) 22#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_log_domain, __VA_ARGS__)
23 23
24#include "emotion_modules.h" 24#include "emotion_modules.h"
25 25
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 1d9976895f..2fd13a9dad 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -31,10 +31,10 @@
31 31
32extern int _eo_log_dom; 32extern int _eo_log_dom;
33 33
34#ifdef CRITICAL 34#ifdef CRI
35#undef CRITICAL 35#undef CRI
36#endif 36#endif
37#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eo_log_dom, __VA_ARGS__) 37#define CRI(...) EINA_LOG_DOM_CRIT(_eo_log_dom, __VA_ARGS__)
38 38
39#ifdef ERR 39#ifdef ERR
40#undef ERR 40#undef ERR
diff --git a/src/lib/ephysics/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index 5b09a29f5d..6b594d94b1 100644
--- a/src/lib/ephysics/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
@@ -44,10 +44,10 @@
44#endif 44#endif
45#define WRN(...) EINA_LOG_DOM_WARN(_ephysics_log_dom, __VA_ARGS__) 45#define WRN(...) EINA_LOG_DOM_WARN(_ephysics_log_dom, __VA_ARGS__)
46 46
47#ifdef CRIT 47#ifdef CRI
48# undef CRIT 48# undef CRI
49#endif 49#endif
50#define CRIT(...) EINA_LOG_DOM_CRIT(_ephysics_log_dom, __VA_ARGS__) 50#define CRI(...) EINA_LOG_DOM_CRIT(_ephysics_log_dom, __VA_ARGS__)
51 51
52#ifdef __cplusplus 52#ifdef __cplusplus
53extern "C" { 53extern "C" {
diff --git a/src/lib/ethumb_client/ethumb_client.c b/src/lib/ethumb_client/ethumb_client.c
index a7ed9d385f..5524370f86 100644
--- a/src/lib/ethumb_client/ethumb_client.c
+++ b/src/lib/ethumb_client/ethumb_client.c
@@ -93,7 +93,7 @@ static int _log_dom = -1;
93#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__) 93#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
94#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__) 94#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
95#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) 95#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
96#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 96#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
97 97
98struct _Ethumb_Client 98struct _Ethumb_Client
99{ 99{
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 4472fd59bd..20585be483 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -224,28 +224,28 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
224 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return; 224 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
225 if (eo_obj == eo_clip) 225 if (eo_obj == eo_clip)
226 { 226 {
227 CRIT("Setting clip %p on itself", eo_obj); 227 CRI("Setting clip %p on itself", eo_obj);
228 return; 228 return;
229 } 229 }
230 if (clip->delete_me) 230 if (clip->delete_me)
231 { 231 {
232 CRIT("Setting deleted object %p as clip obj %p", eo_clip, eo_obj); 232 CRI("Setting deleted object %p as clip obj %p", eo_clip, eo_obj);
233 return; 233 return;
234 } 234 }
235 if (obj->delete_me) 235 if (obj->delete_me)
236 { 236 {
237 CRIT("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj); 237 CRI("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj);
238 return; 238 return;
239 } 239 }
240 if (!obj->layer) 240 if (!obj->layer)
241 { 241 {
242 CRIT("No evas surface associated with object (%p)", eo_obj); 242 CRI("No evas surface associated with object (%p)", eo_obj);
243 return; 243 return;
244 } 244 }
245 if ((obj->layer && clip->layer) && 245 if ((obj->layer && clip->layer) &&
246 (obj->layer->evas != clip->layer->evas)) 246 (obj->layer->evas != clip->layer->evas))
247 { 247 {
248 CRIT("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas); 248 CRI("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas);
249 return; 249 return;
250 } 250 }
251 251
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 194f3e7841..1d27bfade6 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -53,7 +53,7 @@ static void _sizing_eval(Evas_Object *obj);
53 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 53 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
54if (!ptr) \ 54if (!ptr) \
55{ \ 55{ \
56 CRIT("no widget data for object %p (%s)", \ 56 CRI("no widget data for object %p (%s)", \
57 o, evas_object_type_get(o)); \ 57 o, evas_object_type_get(o)); \
58 fflush(stderr); \ 58 fflush(stderr); \
59 return; \ 59 return; \
@@ -63,7 +63,7 @@ if (!ptr) \
63 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 63 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
64if (!ptr) \ 64if (!ptr) \
65{ \ 65{ \
66 CRIT("no widget data for object %p (%s)", \ 66 CRI("no widget data for object %p (%s)", \
67 o, evas_object_type_get(o)); \ 67 o, evas_object_type_get(o)); \
68 fflush(stderr); \ 68 fflush(stderr); \
69 return val; \ 69 return val; \
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 67e5d9212b..707dd696b8 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -53,7 +53,7 @@ struct _Evas_Object_Grid_Accessor
53 EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ 53 EVAS_OBJECT_GRID_DATA_GET(o, ptr); \
54 if (!ptr) \ 54 if (!ptr) \
55 { \ 55 { \
56 CRIT("no widget data for object %p (%s)", \ 56 CRI("no widget data for object %p (%s)", \
57 o, evas_object_type_get(o)); \ 57 o, evas_object_type_get(o)); \
58 abort(); \ 58 abort(); \
59 return; \ 59 return; \
@@ -63,7 +63,7 @@ struct _Evas_Object_Grid_Accessor
63 EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ 63 EVAS_OBJECT_GRID_DATA_GET(o, ptr); \
64 if (!ptr) \ 64 if (!ptr) \
65 { \ 65 { \
66 CRIT("No widget data for object %p (%s)", \ 66 CRI("No widget data for object %p (%s)", \
67 o, evas_object_type_get(o)); \ 67 o, evas_object_type_get(o)); \
68 abort(); \ 68 abort(); \
69 return val; \ 69 return val; \
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index ce2e918349..043ad92b3b 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -654,18 +654,18 @@ _image_source_set(Eo *eo_obj, void *_pd, va_list *list)
654 } 654 }
655 if (!src->layer) 655 if (!src->layer)
656 { 656 {
657 CRIT("No evas surface associated with source object (%p)", eo_obj); 657 CRI("No evas surface associated with source object (%p)", eo_obj);
658 return; 658 return;
659 } 659 }
660 if ((obj->layer && src->layer) && 660 if ((obj->layer && src->layer) &&
661 (obj->layer->evas != src->layer->evas)) 661 (obj->layer->evas != src->layer->evas))
662 { 662 {
663 CRIT("Setting object %p from Evas (%p) from another Evas (%p)", eo_src, src->layer->evas, obj->layer->evas); 663 CRI("Setting object %p from Evas (%p) from another Evas (%p)", eo_src, src->layer->evas, obj->layer->evas);
664 return; 664 return;
665 } 665 }
666 if (eo_src == eo_obj) 666 if (eo_src == eo_obj)
667 { 667 {
668 CRIT("Setting object %p as a source for itself", obj); 668 CRI("Setting object %p as a source for itself", obj);
669 return; 669 return;
670 } 670 }
671 } 671 }
@@ -3724,7 +3724,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
3724 obj->cur->geometry.y == y && 3724 obj->cur->geometry.y == y &&
3725 obj->cur->geometry.w == w && 3725 obj->cur->geometry.w == w &&
3726 obj->cur->geometry.h == h)) 3726 obj->cur->geometry.h == h))
3727 CRIT("Evas_Object_Image geometry did change during pixels get callback !"); 3727 CRI("Evas_Object_Image geometry did change during pixels get callback !");
3728 3728
3729 o->engine_data = obj->layer->evas->engine.func->image_dirty_region 3729 o->engine_data = obj->layer->evas->engine.func->image_dirty_region
3730 (obj->layer->evas->engine.data.output, o->engine_data, 3730 (obj->layer->evas->engine.data.output, o->engine_data,
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 2e09f8187b..119702aa87 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -253,26 +253,26 @@ _smart_member_add(Eo *smart_obj, void *_pd, va_list *list)
253 253
254 if (obj->delete_me) 254 if (obj->delete_me)
255 { 255 {
256 CRIT("Adding deleted object %p to smart obj %p", eo_obj, smart_obj); 256 CRI("Adding deleted object %p to smart obj %p", eo_obj, smart_obj);
257 abort(); 257 abort();
258 return; 258 return;
259 } 259 }
260 if (smart->delete_me) 260 if (smart->delete_me)
261 { 261 {
262 CRIT("Adding object %p to deleted smart obj %p", eo_obj, smart_obj); 262 CRI("Adding object %p to deleted smart obj %p", eo_obj, smart_obj);
263 abort(); 263 abort();
264 return; 264 return;
265 } 265 }
266 if (!smart->layer) 266 if (!smart->layer)
267 { 267 {
268 CRIT("No evas surface associated with smart object (%p)", smart_obj); 268 CRI("No evas surface associated with smart object (%p)", smart_obj);
269 abort(); 269 abort();
270 return; 270 return;
271 } 271 }
272 if ((obj->layer && smart->layer) && 272 if ((obj->layer && smart->layer) &&
273 (obj->layer->evas != smart->layer->evas)) 273 (obj->layer->evas != smart->layer->evas))
274 { 274 {
275 CRIT("Adding object %p from Evas (%p) from another Evas (%p)", eo_obj, obj->layer->evas, smart->layer->evas); 275 CRI("Adding object %p from Evas (%p) from another Evas (%p)", eo_obj, obj->layer->evas, smart->layer->evas);
276 abort(); 276 abort();
277 return; 277 return;
278 } 278 }
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 3b1f533af7..624c6b2baf 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -104,7 +104,7 @@ struct _Evas_Object_Table_Accessor
104 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ 104 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
105if (!ptr) \ 105if (!ptr) \
106{ \ 106{ \
107 CRIT("no widget data for object %p (%s)", \ 107 CRI("no widget data for object %p (%s)", \
108 o, evas_object_type_get(o)); \ 108 o, evas_object_type_get(o)); \
109 return; \ 109 return; \
110} 110}
@@ -113,7 +113,7 @@ if (!ptr) \
113 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ 113 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
114if (!ptr) \ 114if (!ptr) \
115{ \ 115{ \
116 CRIT("No widget data for object %p (%s)", \ 116 CRI("No widget data for object %p (%s)", \
117 o, evas_object_type_get(o)); \ 117 o, evas_object_type_get(o)); \
118 return val; \ 118 return val; \
119} 119}
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 1fe0f1643b..5851918c5e 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -102,10 +102,10 @@ static const char o_type[] = "textblock";
102 ((ch) == _TAB) || \ 102 ((ch) == _TAB) || \
103 ((ch) == _PARAGRAPH_SEPARATOR)) 103 ((ch) == _PARAGRAPH_SEPARATOR))
104 104
105#ifdef CRITICAL 105#ifdef CRI
106#undef CRITICAL 106#undef CRI
107#endif 107#endif
108#define CRITICAL(...) EINA_LOG_DOM_CRIT(EINA_LOG_DOMAIN_DEFAULT, __VA_ARGS__) 108#define CRI(...) EINA_LOG_DOM_CRIT(EINA_LOG_DOMAIN_DEFAULT, __VA_ARGS__)
109 109
110#ifdef ERR 110#ifdef ERR
111#undef ERR 111#undef ERR
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index c9b90af7e5..92c6402f8c 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -274,7 +274,7 @@ evas_common_load_rgba_image_module_from_file(Image_Entry *ie)
274 274
275#ifdef EVAS_CSERVE2 275#ifdef EVAS_CSERVE2
276 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie)) 276 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
277 CRIT("This function shouldn't be called anymore!"); 277 CRI("This function shouldn't be called anymore!");
278#endif 278#endif
279 279
280 if (ie->f) 280 if (ie->f)
@@ -391,7 +391,7 @@ evas_common_load_rgba_image_data_from_file(Image_Entry *ie)
391 391
392#ifdef EVAS_CSERVE2 392#ifdef EVAS_CSERVE2
393 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie)) 393 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
394 CRIT("This function shouldn't be called anymore!"); 394 CRI("This function shouldn't be called anymore!");
395#endif 395#endif
396 396
397 if (!ie->info.module) return EVAS_LOAD_ERROR_GENERIC; 397 if (!ie->info.module) return EVAS_LOAD_ERROR_GENERIC;
diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index f37f43a6f7..e84eb2c649 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -127,12 +127,12 @@ evas_thread_init(void)
127 eina_inarray_step_set(&evas_thread_queue, sizeof (Eina_Inarray), sizeof (Evas_Thread_Command), 128); 127 eina_inarray_step_set(&evas_thread_queue, sizeof (Eina_Inarray), sizeof (Evas_Thread_Command), 128);
128 128
129 if (!eina_lock_new(&evas_thread_queue_lock)) 129 if (!eina_lock_new(&evas_thread_queue_lock))
130 CRIT("Could not create draw thread lock"); 130 CRI("Could not create draw thread lock");
131 if (!eina_condition_new(&evas_thread_queue_condition, &evas_thread_queue_lock)) 131 if (!eina_condition_new(&evas_thread_queue_condition, &evas_thread_queue_lock))
132 CRIT("Could not create draw thread condition"); 132 CRI("Could not create draw thread condition");
133 if (!eina_thread_create(&evas_thread_worker, EINA_THREAD_NORMAL, 0, 133 if (!eina_thread_create(&evas_thread_worker, EINA_THREAD_NORMAL, 0,
134 evas_thread_worker_func, NULL)) 134 evas_thread_worker_func, NULL))
135 CRIT("Could not create draw thread"); 135 CRI("Could not create draw thread");
136} 136}
137 137
138void 138void
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index c65003f7d6..7609f4b8fd 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -507,7 +507,7 @@ evas_cserve2_shutdown(void)
507 507
508 if (cserve2_init <= 0) 508 if (cserve2_init <= 0)
509 { 509 {
510 CRIT("cserve2 is already shutdown"); 510 CRI("cserve2 is already shutdown");
511 return -1; 511 return -1;
512 } 512 }
513 513
@@ -2515,8 +2515,8 @@ _server_index_list_set(Msg_Base *data, int size)
2515 2515
2516 if (size != sizeof(*msg) || msg->base.type != CSERVE2_INDEX_LIST) 2516 if (size != sizeof(*msg) || msg->base.type != CSERVE2_INDEX_LIST)
2517 { 2517 {
2518 CRIT("Invalid message! type: %d, size: %d (expected %d)", 2518 CRI("Invalid message! type: %d, size: %d (expected %d)",
2519 msg->base.type, size, (int) sizeof(*msg)); 2519 msg->base.type, size, (int) sizeof(*msg));
2520 return -1; 2520 return -1;
2521 } 2521 }
2522 2522
@@ -2582,7 +2582,7 @@ _shared_string_internal_get(int id, Eina_Bool safe)
2582 2582
2583 if (!_index.strings_entries.data) 2583 if (!_index.strings_entries.data)
2584 { 2584 {
2585 CRIT("Strings table is not valid: no data"); 2585 CRI("Strings table is not valid: no data");
2586 return NULL; 2586 return NULL;
2587 } 2587 }
2588 2588
@@ -2622,7 +2622,7 @@ _shared_string_get(int id)
2622 2622
2623#define SHARED_INDEX_CHECK(si, typ) \ 2623#define SHARED_INDEX_CHECK(si, typ) \
2624 do { if (!_shared_index_remap_check(&(si), sizeof(typ))) { \ 2624 do { if (!_shared_index_remap_check(&(si), sizeof(typ))) { \
2625 CRIT("Failed to remap index"); return NULL; } } while (0) 2625 CRI("Failed to remap index"); return NULL; } } while (0)
2626 2626
2627static const File_Data * 2627static const File_Data *
2628_shared_image_entry_file_data_find(Image_Entry *ie) 2628_shared_image_entry_file_data_find(Image_Entry *ie)
@@ -2959,7 +2959,7 @@ _shared_image_entry_image_data_find(Image_Entry *ie)
2959 2959
2960 if (!ie->cache_key) 2960 if (!ie->cache_key)
2961 { 2961 {
2962 CRIT("Looking for an image in remote cache without hash key?"); 2962 CRI("Looking for an image in remote cache without hash key?");
2963 return NULL; 2963 return NULL;
2964 } 2964 }
2965 2965
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 4f48fd4aaf..47441f7276 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -96,10 +96,10 @@ extern EAPI int _evas_log_dom_global;
96#endif 96#endif
97#define WRN(...) EINA_LOG_DOM_WARN(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__) 97#define WRN(...) EINA_LOG_DOM_WARN(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
98 98
99#ifdef CRIT 99#ifdef CRI
100# undef CRIT 100# undef CRI
101#endif 101#endif
102#define CRIT(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__) 102#define CRI(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
103 103
104#include "evas_options.h" 104#include "evas_options.h"
105 105
diff --git a/src/lib/evas/main.c b/src/lib/evas/main.c
index 92e927c2d5..e59877cdd6 100644
--- a/src/lib/evas/main.c
+++ b/src/lib/evas/main.c
@@ -70,7 +70,7 @@ evas_debug_error(void)
70 _evas_debug_init_from_env(); 70 _evas_debug_init_from_env();
71 } 71 }
72 if (_evas_debug_show == _EVAS_DEBUG_SHOW) 72 if (_evas_debug_show == _EVAS_DEBUG_SHOW)
73 CRIT("Evas Magic Check Failed!!!"); 73 CRI("Evas Magic Check Failed!!!");
74} 74}
75 75
76void 76void
@@ -81,7 +81,7 @@ evas_debug_input_null(void)
81 _evas_debug_init_from_env(); 81 _evas_debug_init_from_env();
82 } 82 }
83 if (_evas_debug_show == _EVAS_DEBUG_SHOW) 83 if (_evas_debug_show == _EVAS_DEBUG_SHOW)
84 CRIT("Input object pointer is NULL!"); 84 CRI("Input object pointer is NULL!");
85 if (_evas_debug_abort) abort(); 85 if (_evas_debug_abort) abort();
86} 86}
87 87
@@ -94,7 +94,7 @@ evas_debug_magic_null(void)
94 } 94 }
95 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) || 95 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
96 (_evas_debug_show == _EVAS_DEBUG_DEFAULT)) 96 (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
97 CRIT("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!"); 97 CRI("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
98 if (_evas_debug_abort) abort(); 98 if (_evas_debug_abort) abort();
99} 99}
100 100
@@ -107,7 +107,7 @@ evas_debug_magic_wrong(DATA32 expected, DATA32 supplied)
107 } 107 }
108 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) || 108 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
109 (_evas_debug_show == _EVAS_DEBUG_DEFAULT)) 109 (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
110 CRIT("Input object is wrong type\n" 110 CRI("Input object is wrong type\n"
111 " Expected: %08x - %s\n" 111 " Expected: %08x - %s\n"
112 " Supplied: %08x - %s", 112 " Supplied: %08x - %s",
113 expected, evas_debug_magic_string_get(expected), 113 expected, evas_debug_magic_string_get(expected),
@@ -124,7 +124,7 @@ evas_debug_generic(const char *str)
124 } 124 }
125 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) || 125 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
126 (_evas_debug_show == _EVAS_DEBUG_DEFAULT)) 126 (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
127 CRIT("%s", str); 127 CRI("%s", str);
128 if (_evas_debug_abort) abort(); 128 if (_evas_debug_abort) abort();
129} 129}
130 130
diff --git a/src/modules/ecore/system/systemd/ecore_system_systemd.c b/src/modules/ecore/system/systemd/ecore_system_systemd.c
index 9579b33b98..57562224d1 100644
--- a/src/modules/ecore/system/systemd/ecore_system_systemd.c
+++ b/src/modules/ecore/system/systemd/ecore_system_systemd.c
@@ -12,10 +12,10 @@ static Eldbus_Connection *_conn = NULL;
12static Eina_List *_objs = NULL; 12static Eina_List *_objs = NULL;
13static Eina_List *_proxies = NULL; 13static Eina_List *_proxies = NULL;
14 14
15#ifdef CRITICAL 15#ifdef CRI
16#undef CRITICAL 16#undef CRI
17#endif 17#endif
18#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 18#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
19 19
20#ifdef ERR 20#ifdef ERR
21#undef ERR 21#undef ERR
diff --git a/src/modules/ecore/system/tizen/ecore_system_tizen.c b/src/modules/ecore/system/tizen/ecore_system_tizen.c
index 69c2cf78f0..56beeb9726 100644
--- a/src/modules/ecore/system/tizen/ecore_system_tizen.c
+++ b/src/modules/ecore/system/tizen/ecore_system_tizen.c
@@ -8,10 +8,10 @@
8 8
9static int _log_dom = -1; 9static int _log_dom = -1;
10 10
11#ifdef CRITICAL 11#ifdef CRI
12#undef CRITICAL 12#undef CRI
13#endif 13#endif
14#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 14#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
15 15
16#ifdef ERR 16#ifdef ERR
17#undef ERR 17#undef ERR
diff --git a/src/modules/ecore/system/upower/ecore_system_upower.c b/src/modules/ecore/system/upower/ecore_system_upower.c
index 5a9d2dbde1..614c364858 100644
--- a/src/modules/ecore/system/upower/ecore_system_upower.c
+++ b/src/modules/ecore/system/upower/ecore_system_upower.c
@@ -12,10 +12,10 @@ static Eldbus_Connection *_conn = NULL;
12static Eldbus_Object *_obj = NULL; 12static Eldbus_Object *_obj = NULL;
13static Eldbus_Proxy *_proxy = NULL; 13static Eldbus_Proxy *_proxy = NULL;
14 14
15#ifdef CRITICAL 15#ifdef CRI
16#undef CRITICAL 16#undef CRI
17#endif 17#endif
18#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 18#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
19 19
20#ifdef ERR 20#ifdef ERR
21#undef ERR 21#undef ERR
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index 6b0374c152..5598cacaa0 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -18,10 +18,10 @@
18 18
19static int _ecore_imf_xim_log_dom = -1; 19static int _ecore_imf_xim_log_dom = -1;
20 20
21#ifdef CRITICAL 21#ifdef CRI
22#undef CRITICAL 22#undef CRI
23#endif 23#endif
24#define CRITICAL(...) EINA_LOG_DOM_CRIT(_ecore_imf_xim_log_dom, __VA_ARGS__) 24#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_imf_xim_log_dom, __VA_ARGS__)
25 25
26#ifdef ERR 26#ifdef ERR
27#undef ERR 27#undef ERR
diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c
index 9b4303a07a..4a5a6409c4 100644
--- a/src/modules/emotion/generic/emotion_generic.c
+++ b/src/modules/emotion/generic/emotion_generic.c
@@ -42,10 +42,10 @@ static int _emotion_generic_log_domain = -1;
42#endif 42#endif
43#define ERR(...) EINA_LOG_DOM_ERR(_emotion_generic_log_domain, __VA_ARGS__) 43#define ERR(...) EINA_LOG_DOM_ERR(_emotion_generic_log_domain, __VA_ARGS__)
44 44
45#ifdef CRITICAL 45#ifdef CRI
46#undef CRITICAL 46#undef CRI
47#endif 47#endif
48#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_generic_log_domain, __VA_ARGS__) 48#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_generic_log_domain, __VA_ARGS__)
49 49
50 50
51static Eina_Bool _fork_and_exec(Emotion_Generic_Video *ev); 51static Eina_Bool _fork_and_exec(Emotion_Generic_Video *ev);
@@ -1867,7 +1867,7 @@ generic_module_init(void)
1867 PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); 1867 PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
1868 if (!pfx) 1868 if (!pfx)
1869 { 1869 {
1870 CRITICAL("Could not get prefix for emotion"); 1870 CRI("Could not get prefix for emotion");
1871 eina_log_domain_unregister(_emotion_generic_log_domain); 1871 eina_log_domain_unregister(_emotion_generic_log_domain);
1872 _emotion_generic_log_domain = -1; 1872 _emotion_generic_log_domain = -1;
1873 return EINA_FALSE; 1873 return EINA_FALSE;
diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.h b/src/modules/emotion/gstreamer/emotion_gstreamer.h
index a6af9bc4d0..4b15ae5777 100644
--- a/src/modules/emotion/gstreamer/emotion_gstreamer.h
+++ b/src/modules/emotion/gstreamer/emotion_gstreamer.h
@@ -216,10 +216,10 @@ extern Eina_Bool _ecore_x_available;
216#endif 216#endif
217#define ERR(...) EINA_LOG_DOM_ERR(_emotion_gstreamer_log_domain, __VA_ARGS__) 217#define ERR(...) EINA_LOG_DOM_ERR(_emotion_gstreamer_log_domain, __VA_ARGS__)
218 218
219#ifdef CRITICAL 219#ifdef CRI
220#undef CRITICAL 220#undef CRI
221#endif 221#endif
222#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__) 222#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__)
223 223
224#define EVAS_TYPE_VIDEO_SINK evas_video_sink_get_type() 224#define EVAS_TYPE_VIDEO_SINK evas_video_sink_get_type()
225 225
diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.h b/src/modules/emotion/gstreamer1/emotion_gstreamer.h
index 7ba9050cf0..9aa844d2a7 100644
--- a/src/modules/emotion/gstreamer1/emotion_gstreamer.h
+++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.h
@@ -231,10 +231,10 @@ extern Eina_Bool _ecore_x_available;
231#endif 231#endif
232#define ERR(...) EINA_LOG_DOM_ERR(_emotion_gstreamer_log_domain, __VA_ARGS__) 232#define ERR(...) EINA_LOG_DOM_ERR(_emotion_gstreamer_log_domain, __VA_ARGS__)
233 233
234#ifdef CRITICAL 234#ifdef CRI
235#undef CRITICAL 235#undef CRI
236#endif 236#endif
237#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__) 237#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_gstreamer_log_domain, __VA_ARGS__)
238 238
239#define EVAS_TYPE_VIDEO_SINK evas_video_sink_get_type() 239#define EVAS_TYPE_VIDEO_SINK evas_video_sink_get_type()
240 240
diff --git a/src/modules/emotion/xine/emotion_xine.c b/src/modules/emotion/xine/emotion_xine.c
index 7a82954dbe..6ff6de10a4 100644
--- a/src/modules/emotion/xine/emotion_xine.c
+++ b/src/modules/emotion/xine/emotion_xine.c
@@ -1562,7 +1562,7 @@ xine_module_init(void)
1562 1562
1563 if (!_emotion_module_register(&em_engine)) 1563 if (!_emotion_module_register(&em_engine))
1564 { 1564 {
1565 CRITICAL("Could not register module %p", &em_engine); 1565 CRI("Could not register module %p", &em_engine);
1566 eina_log_domain_unregister(_emotion_xine_log_domain); 1566 eina_log_domain_unregister(_emotion_xine_log_domain);
1567 _emotion_xine_log_domain = -1; 1567 _emotion_xine_log_domain = -1;
1568 return EINA_FALSE; 1568 return EINA_FALSE;
diff --git a/src/modules/emotion/xine/emotion_xine.h b/src/modules/emotion/xine/emotion_xine.h
index 129256e30f..9807624e14 100644
--- a/src/modules/emotion/xine/emotion_xine.h
+++ b/src/modules/emotion/xine/emotion_xine.h
@@ -108,10 +108,10 @@ struct _Emotion_Xine_Event
108#endif 108#endif
109#define ERR(...) EINA_LOG_DOM_ERR(_emotion_xine_log_domain, __VA_ARGS__) 109#define ERR(...) EINA_LOG_DOM_ERR(_emotion_xine_log_domain, __VA_ARGS__)
110 110
111#ifdef CRITICAL 111#ifdef CRI
112#undef CRITICAL 112#undef CRI
113#endif 113#endif
114#define CRITICAL(...) EINA_LOG_DOM_CRIT(_emotion_xine_log_domain, __VA_ARGS__) 114#define CRI(...) EINA_LOG_DOM_CRIT(_emotion_xine_log_domain, __VA_ARGS__)
115 115
116extern int _emotion_xine_log_domain; 116extern int _emotion_xine_log_domain;
117 117
diff --git a/src/modules/evas/engines/buffer/evas_engine.h b/src/modules/evas/engines/buffer/evas_engine.h
index 8cdf8f4e53..130a0e2dc0 100644
--- a/src/modules/evas/engines/buffer/evas_engine.h
+++ b/src/modules/evas/engines/buffer/evas_engine.h
@@ -24,10 +24,10 @@ extern int _evas_engine_buffer_log_dom ;
24#endif 24#endif
25#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_buffer_log_dom, __VA_ARGS__) 25#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_buffer_log_dom, __VA_ARGS__)
26 26
27#ifdef CRIT 27#ifdef CRI
28# undef CRIT 28# undef CRI
29#endif 29#endif
30#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_buffer_log_dom, __VA_ARGS__) 30#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_buffer_log_dom, __VA_ARGS__)
31 31
32typedef struct _Outbuf Outbuf; 32typedef struct _Outbuf Outbuf;
33 33
diff --git a/src/modules/evas/engines/drm/evas_engine.h b/src/modules/evas/engines/drm/evas_engine.h
index 814158842c..3cfbbeeb6a 100644
--- a/src/modules/evas/engines/drm/evas_engine.h
+++ b/src/modules/evas/engines/drm/evas_engine.h
@@ -23,10 +23,10 @@ extern int _evas_engine_drm_log_dom;
23# endif 23# endif
24# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_drm_log_dom, __VA_ARGS__) 24# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_drm_log_dom, __VA_ARGS__)
25 25
26# ifdef CRIT 26# ifdef CRI
27# undef CRIT 27# undef CRI
28# endif 28# endif
29# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__) 29# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__)
30 30
31typedef struct _Outbuf Outbuf; 31typedef struct _Outbuf Outbuf;
32 32
diff --git a/src/modules/evas/engines/fb/evas_engine.h b/src/modules/evas/engines/fb/evas_engine.h
index 295e91e4b1..45e2715e4d 100644
--- a/src/modules/evas/engines/fb/evas_engine.h
+++ b/src/modules/evas/engines/fb/evas_engine.h
@@ -24,10 +24,10 @@ extern int _evas_engine_fb_log_dom;
24#endif 24#endif
25#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_fb_log_dom, __VA_ARGS__) 25#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_fb_log_dom, __VA_ARGS__)
26 26
27#ifdef CRIT 27#ifdef CRI
28# undef CRIT 28# undef CRI
29#endif 29#endif
30#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_fb_log_dom, __VA_ARGS__) 30#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_fb_log_dom, __VA_ARGS__)
31 31
32typedef struct _Outbuf Outbuf; 32typedef struct _Outbuf Outbuf;
33 33
diff --git a/src/modules/evas/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c
index b958c924e2..3539d7e6af 100644
--- a/src/modules/evas/engines/fb/evas_fb_main.c
+++ b/src/modules/evas/engines/fb/evas_fb_main.c
@@ -417,7 +417,7 @@ fb_setvt(int vtno)
417 } 417 }
418 if (access(vtname,R_OK | W_OK) == -1) 418 if (access(vtname,R_OK | W_OK) == -1)
419 { 419 {
420 CRIT("Access %s: %s",vtname,strerror(errno)); 420 CRI("Access %s: %s",vtname,strerror(errno));
421 return; 421 return;
422 } 422 }
423 vtfd = open(vtname,O_RDWR); 423 vtfd = open(vtname,O_RDWR);
@@ -472,7 +472,7 @@ fb_init(int vt EINA_UNUSED, int device)
472 } 472 }
473 if (fb == -1) 473 if (fb == -1)
474 { 474 {
475 CRIT("open %s: %s", dev, strerror(errno)); 475 CRI("open %s: %s", dev, strerror(errno));
476 fb_cleanup(); 476 fb_cleanup();
477 return; 477 return;
478 } 478 }
@@ -533,7 +533,7 @@ fb_postinit(FB_Mode *mode)
533 533
534 if (fb_fix.type != FB_TYPE_PACKED_PIXELS) 534 if (fb_fix.type != FB_TYPE_PACKED_PIXELS)
535 { 535 {
536 CRIT("can handle only packed pixel frame buffers"); 536 CRI("can handle only packed pixel frame buffers");
537 fb_cleanup(); 537 fb_cleanup();
538 return 0; 538 return 0;
539 } 539 }
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.h b/src/modules/evas/engines/gl_cocoa/evas_engine.h
index a066d3e58d..bfc12d0ae8 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.h
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.h
@@ -32,10 +32,10 @@ extern int _evas_engine_gl_cocoa_log_dom;
32#endif 32#endif
33#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__) 33#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
34 34
35#ifdef CRIT 35#ifdef CRI
36# undef CRIT 36# undef CRI
37#endif 37#endif
38#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__) 38#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_gl_cocoa_log_dom, __VA_ARGS__)
39 39
40typedef struct _Evas_GL_Cocoa_Window Evas_GL_Cocoa_Window; 40typedef struct _Evas_GL_Cocoa_Window Evas_GL_Cocoa_Window;
41 41
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index a2ba18c542..d831f9d73d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -20,7 +20,7 @@ void _make_current_check(const char* api)
20 20
21 if (!ctx) 21 if (!ctx)
22 { 22 {
23 CRIT("\e[1;33m%s\e[m: Current Context NOT SET: GL Call Should NOT Be Called without MakeCurrent!!!", api); 23 CRI("\e[1;33m%s\e[m: Current Context NOT SET: GL Call Should NOT Be Called without MakeCurrent!!!", api);
24 } 24 }
25} 25}
26 26
@@ -38,7 +38,7 @@ void _direct_rendering_check(const char *api)
38 38
39 if (_evgl_not_in_pixel_get()) 39 if (_evgl_not_in_pixel_get())
40 { 40 {
41 CRIT("\e[1;33m%s\e[m: This API is being called outside Pixel Get Callback Function.", api); 41 CRI("\e[1;33m%s\e[m: This API is being called outside Pixel Get Callback Function.", api);
42 } 42 }
43} 43}
44 44
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
index 254da65bf7..85ccf9e265 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
@@ -29,10 +29,10 @@ extern int _evas_gl_log_dom;
29#endif 29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_evas_gl_log_dom, __VA_ARGS__) 30#define WRN(...) EINA_LOG_DOM_WARN(_evas_gl_log_dom, __VA_ARGS__)
31 31
32#ifdef CRIT 32#ifdef CRI
33# undef CRIT 33# undef CRI
34#endif 34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_gl_log_dom, __VA_ARGS__) 35#define CRI(...) EINA_LOG_DOM_CRIT(_evas_gl_log_dom, __VA_ARGS__)
36 36
37 37
38struct _EVGL_Interface 38struct _EVGL_Interface
diff --git a/src/modules/evas/engines/gl_common/evas_gl_private.h b/src/modules/evas/engines/gl_common/evas_gl_private.h
index a178823fd9..8f7eb21a23 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_private.h
@@ -24,9 +24,9 @@ extern int _evas_engine_GL_common_log_dom;
24#endif 24#endif
25#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_common_log_dom, __VA_ARGS__) 25#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_common_log_dom, __VA_ARGS__)
26 26
27#ifdef CRIT 27#ifdef CRI
28# undef CRIT 28# undef CRI
29#endif 29#endif
30#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_common_log_dom, __VA_ARGS__) 30#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_common_log_dom, __VA_ARGS__)
31 31
32#endif 32#endif
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 6e89f21ca2..89e6f99ac2 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -1049,7 +1049,7 @@ _sdl_output_setup (int w, int h, int fullscreen, int noframe)
1049 1049
1050 if (!surface) 1050 if (!surface)
1051 { 1051 {
1052 CRIT("SDL_SetVideoMode [ %i x %i x 32 ] failed. %s", w, h, SDL_GetError()); 1052 CRI("SDL_SetVideoMode [ %i x %i x 32 ] failed. %s", w, h, SDL_GetError());
1053 SDL_Quit(); 1053 SDL_Quit();
1054 exit(-1); 1054 exit(-1);
1055 } 1055 }
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.h b/src/modules/evas/engines/gl_sdl/evas_engine.h
index 837b7d9303..459dd7d87a 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.h
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.h
@@ -44,10 +44,10 @@ extern int _evas_engine_GL_SDL_log_dom ;
44#endif 44#endif
45#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_SDL_log_dom, __VA_ARGS__) 45#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
46 46
47#ifdef CRIT 47#ifdef CRI
48# undef CRIT 48# undef CRI
49#endif 49#endif
50#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_SDL_log_dom, __VA_ARGS__) 50#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_SDL_log_dom, __VA_ARGS__)
51 51
52typedef struct _Render_Engine Render_Engine; 52typedef struct _Render_Engine Render_Engine;
53struct _Render_Engine 53struct _Render_Engine
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h
index 371a10b39d..c03950b907 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.h
+++ b/src/modules/evas/engines/gl_x11/evas_engine.h
@@ -52,10 +52,10 @@ extern int _evas_engine_GL_X11_log_dom ;
52#endif 52#endif
53#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_X11_log_dom, __VA_ARGS__) 53#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
54 54
55#ifdef CRIT 55#ifdef CRI
56# undef CRIT 56# undef CRI
57#endif 57#endif
58#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__) 58#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
59 59
60typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window; 60typedef struct _Evas_GL_X11_Window Evas_GL_X11_Window;
61 61
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.h b/src/modules/evas/engines/psl1ght/evas_engine.h
index 0ea6cb1d27..638106e163 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.h
+++ b/src/modules/evas/engines/psl1ght/evas_engine.h
@@ -22,9 +22,9 @@ extern int _evas_engine_psl1ght_log_dom;
22#endif 22#endif
23#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_psl1ght_log_dom, __VA_ARGS__) 23#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
24 24
25#ifdef CRIT 25#ifdef CRI
26# undef CRIT 26# undef CRI
27#endif 27#endif
28#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_psl1ght_log_dom, __VA_ARGS__) 28#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_psl1ght_log_dom, __VA_ARGS__)
29 29
30#endif 30#endif
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.h b/src/modules/evas/engines/software_gdi/evas_engine.h
index b8ddc851e3..2f8a6ebb72 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.h
+++ b/src/modules/evas/engines/software_gdi/evas_engine.h
@@ -28,10 +28,10 @@ extern int _evas_engine_soft_gdi_log_dom;
28#endif 28#endif
29#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_gdi_log_dom, __VA_ARGS__) 29#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
30 30
31#ifdef CRIT 31#ifdef CRI
32# undef CRIT 32# undef CRI
33#endif 33#endif
34#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_gdi_log_dom, __VA_ARGS__) 34#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_gdi_log_dom, __VA_ARGS__)
35 35
36typedef enum _Outbuf_Depth Outbuf_Depth; 36typedef enum _Outbuf_Depth Outbuf_Depth;
37 37
diff --git a/src/modules/evas/engines/software_x11/evas_engine.h b/src/modules/evas/engines/software_x11/evas_engine.h
index 421e43a306..4e91a1c278 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.h
+++ b/src/modules/evas/engines/software_x11/evas_engine.h
@@ -40,10 +40,10 @@ extern int _evas_engine_soft_x11_log_dom;
40# endif 40# endif
41# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_x11_log_dom, __VA_ARGS__) 41# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
42 42
43# ifdef CRIT 43# ifdef CRI
44# undef CRIT 44# undef CRI
45# endif 45# endif
46# define CRIT(...) \ 46# define CRI(...) \
47 EINA_LOG_DOM_CRIT(_evas_engine_soft_x11_log_dom, __VA_ARGS__) 47 EINA_LOG_DOM_CRIT(_evas_engine_soft_x11_log_dom, __VA_ARGS__)
48 48
49typedef enum _Outbuf_Depth Outbuf_Depth; 49typedef enum _Outbuf_Depth Outbuf_Depth;
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
index 80765401fd..3fc12ce026 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -43,10 +43,10 @@ extern int _evas_engine_wl_egl_log_dom;
43# endif 43# endif
44# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_wl_egl_log_dom, __VA_ARGS__) 44# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
45 45
46# ifdef CRIT 46# ifdef CRI
47# undef CRIT 47# undef CRI
48# endif 48# endif
49# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_wl_egl_log_dom, __VA_ARGS__) 49# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
50 50
51typedef struct _Evas_GL_Wl_Window Evas_GL_Wl_Window; 51typedef struct _Evas_GL_Wl_Window Evas_GL_Wl_Window;
52 52
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index dad011561d..1abae01523 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -32,10 +32,10 @@ extern int _evas_engine_way_shm_log_dom;
32# endif 32# endif
33# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_way_shm_log_dom, __VA_ARGS__) 33# define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_way_shm_log_dom, __VA_ARGS__)
34 34
35# ifdef CRIT 35# ifdef CRI
36# undef CRIT 36# undef CRI
37# endif 37# endif
38# define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_way_shm_log_dom, __VA_ARGS__) 38# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_way_shm_log_dom, __VA_ARGS__)
39 39
40# include <wayland-client.h> 40# include <wayland-client.h>
41 41