summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-12-26 12:22:05 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-12-26 12:27:13 +0900
commit76d8532b5465362f85b75a2a7a5cc3c419304a92 (patch)
tree73482a7b3a246f56d555fd206903db683b14c6aa /src/bin
parent10dd650d90d050889771f88d8b01eb7c1f51b0bd (diff)
efl: Unified eina critical manro to CRI.
Being annoyed by different types of eina critical macros - CRI, CRIT, CRITICAL -, I concluded to unify them to one. Discussed on IRC and finally, CRI was chosen to meet the consistency with other macros - ERR, WRN, INF, DBG - in terms of the number of characters. If there is any missing bits, please let me know.
Diffstat (limited to 'src/bin')
-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
13 files changed, 33 insertions, 33 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