summaryrefslogtreecommitdiff
path: root/legacy/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2009-12-22 13:46:00 +0000
committerCedric BAIL <cedric.bail@free.fr>2009-12-22 13:46:00 +0000
commit018a9dad668bb522b036603626d3784075d9c553 (patch)
treea402cf83b5cf5fb9eab4161bde68825b73d7a0de /legacy/edje
parentbd60dfd40e59484bf4106e73a407e1a89ad93f8a (diff)
* edje: Use Eina_Log.
Patch from Mathieu Taillefumier. SVN revision: 44655
Diffstat (limited to 'legacy/edje')
-rw-r--r--legacy/edje/AUTHORS1
-rw-r--r--legacy/edje/src/bin/edje_cc.c13
-rw-r--r--legacy/edje/src/bin/edje_cc.h17
-rw-r--r--legacy/edje/src/bin/edje_cc_handlers.c338
-rw-r--r--legacy/edje/src/bin/edje_cc_mem.c8
-rw-r--r--legacy/edje/src/bin/edje_cc_out.c30
-rw-r--r--legacy/edje/src/bin/edje_cc_parse.c162
-rw-r--r--legacy/edje/src/bin/edje_cc_sources.c6
-rw-r--r--legacy/edje/src/bin/edje_decc.c58
-rw-r--r--legacy/edje/src/bin/edje_decc.h16
-rw-r--r--legacy/edje/src/bin/edje_prefix.c9
-rw-r--r--legacy/edje/src/lib/edje_cache.c12
-rw-r--r--legacy/edje/src/lib/edje_calc.c44
-rw-r--r--legacy/edje/src/lib/edje_edit.c98
-rw-r--r--legacy/edje/src/lib/edje_embryo.c20
-rw-r--r--legacy/edje/src/lib/edje_external.c8
-rw-r--r--legacy/edje/src/lib/edje_load.c28
-rw-r--r--legacy/edje/src/lib/edje_lua.c9
-rw-r--r--legacy/edje/src/lib/edje_main.c22
-rw-r--r--legacy/edje/src/lib/edje_match.c2
-rw-r--r--legacy/edje/src/lib/edje_private.h21
-rw-r--r--legacy/edje/src/lib/edje_program.c4
-rw-r--r--legacy/edje/src/lib/edje_script_only.c14
-rw-r--r--legacy/edje/src/lib/edje_util.c17
24 files changed, 508 insertions, 449 deletions
diff --git a/legacy/edje/AUTHORS b/legacy/edje/AUTHORS
index 63cdedea18..bbca60fb9d 100644
--- a/legacy/edje/AUTHORS
+++ b/legacy/edje/AUTHORS
@@ -3,3 +3,4 @@ Tilman Sauerbeck (tilman at code-monkey de)
3ZigsMcKenzie <zigsmckenzie@gmail.com> 3ZigsMcKenzie <zigsmckenzie@gmail.com>
4Cedric BAIL <cedric.bail@free.fr> 4Cedric BAIL <cedric.bail@free.fr>
5Brian Mattern <rephorm@rephorm.com> 5Brian Mattern <rephorm@rephorm.com>
6Mathieu Taillefumier <mathieu.taillefumier@free.fr>
diff --git a/legacy/edje/src/bin/edje_cc.c b/legacy/edje/src/bin/edje_cc.c
index 92b740aea1..883e2f2d2d 100644
--- a/legacy/edje/src/bin/edje_cc.c
+++ b/legacy/edje/src/bin/edje_cc.c
@@ -13,7 +13,7 @@
13 13
14#include "edje_cc.h" 14#include "edje_cc.h"
15#include "edje_prefix.h" 15#include "edje_prefix.h"
16 16int _edje_cc_log_dom = -1;
17static void main_help(void); 17static void main_help(void);
18 18
19Eina_List *img_dirs = NULL; 19Eina_List *img_dirs = NULL;
@@ -63,10 +63,15 @@ main(int argc, char **argv)
63 setlocale(LC_NUMERIC, "C"); 63 setlocale(LC_NUMERIC, "C");
64 64
65 eina_init(); 65 eina_init();
66 66 _edje_cc_log_dom = eina_log_domain_register("EDJE_CC", EDJE_DEFAULT_LOG_COLOR);
67 if(_edje_cc_log_dom<0)
68 {
69 EINA_LOG_ERR("Enable to create a log domain.");
70 exit(1);
71 }
67 tmp_dir = getenv("TMPDIR"); 72 tmp_dir = getenv("TMPDIR");
68 73
69 74
70 progname = argv[0]; 75 progname = argv[0];
71 for (i = 1; i < argc; i++) 76 for (i = 1; i < argc; i++)
72 { 77 {
@@ -210,7 +215,7 @@ main(int argc, char **argv)
210 data_write(); 215 data_write();
211 216
212 edje_shutdown(); 217 edje_shutdown();
213 218 eina_log_domain_unregister(_edje_cc_log_dom);
214 eina_shutdown(); 219 eina_shutdown();
215 220
216 return 0; 221 return 0;
diff --git a/legacy/edje/src/bin/edje_cc.h b/legacy/edje/src/bin/edje_cc.h
index dd37f6e5d0..828c6cdda6 100644
--- a/legacy/edje/src/bin/edje_cc.h
+++ b/legacy/edje/src/bin/edje_cc.h
@@ -12,6 +12,23 @@
12# define O_BINARY 0 12# define O_BINARY 0
13#endif 13#endif
14 14
15/* logging variables */
16extern int _edje_cc_log_dom ;
17#define EDJE_CC_DEFAULT_LOG_COLOR EINA_COLOR_CYAN
18#ifdef ERR
19# undef ERR
20#endif
21#define ERR(...) EINA_LOG_DOM_ERR(_edje_cc_log_dom, __VA_ARGS__)
22#ifdef INF
23# undef INF
24#endif
25#define INF(...) EINA_LOG_DOM_INFO(_edje_cc_log_dom, __VA_ARGS__)
26#ifdef WRN
27# undef WRN
28#endif
29#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__)
30
31
15/* types */ 32/* types */
16typedef struct _New_Object_Handler New_Object_Handler; 33typedef struct _New_Object_Handler New_Object_Handler;
17typedef struct _New_Statement_Handler New_Statement_Handler; 34typedef struct _New_Statement_Handler New_Statement_Handler;
diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c
index 12719b4f8e..28a362fb69 100644
--- a/legacy/edje/src/bin/edje_cc_handlers.c
+++ b/legacy/edje/src/bin/edje_cc_handlers.c
@@ -928,23 +928,23 @@ st_data_file(void)
928 fd = open(filename, O_RDONLY | O_BINARY, S_IRUSR | S_IWUSR); 928 fd = open(filename, O_RDONLY | O_BINARY, S_IRUSR | S_IWUSR);
929 if (fd < 0) 929 if (fd < 0)
930 { 930 {
931 fprintf(stderr, "%s: Error. %s:%i when opening file \"%s\": \"%s\"\n", 931 ERR("%s: Error. %s:%i when opening file \"%s\": \"%s\"",
932 progname, file_in, line, filename, strerror(errno)); 932 progname, file_in, line, filename, strerror(errno));
933 exit(-1); 933 exit(-1);
934 } 934 }
935 935
936 if (fstat(fd, &buf)) 936 if (fstat(fd, &buf))
937 { 937 {
938 fprintf(stderr, "%s: Error. %s:%i when stating file \"%s\": \"%s\"\n", 938 ERR("%s: Error. %s:%i when stating file \"%s\": \"%s\"",
939 progname, file_in, line, filename, strerror(errno)); 939 progname, file_in, line, filename, strerror(errno));
940 exit(-1); 940 exit(-1);
941 } 941 }
942 942
943 data = mmap(NULL, buf.st_size, PROT_READ, MAP_SHARED, fd, 0); 943 data = mmap(NULL, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
944 if (data == MAP_FAILED) 944 if (data == MAP_FAILED)
945 { 945 {
946 fprintf(stderr, "%s: Error. %s:%i when mapping file \"%s\": \"%s\"\n", 946 ERR("%s: Error. %s:%i when mapping file \"%s\": \"%s\"",
947 progname, file_in, line, filename, strerror(errno)); 947 progname, file_in, line, filename, strerror(errno));
948 exit(-1); 948 exit(-1);
949 } 949 }
950 950
@@ -952,7 +952,7 @@ st_data_file(void)
952 for (i = 0; i < buf.st_size; ++i, ++over) 952 for (i = 0; i < buf.st_size; ++i, ++over)
953 if (*over == '\0') 953 if (*over == '\0')
954 { 954 {
955 fprintf(stderr, "%s: Error. %s:%i file \"%s\" is a binary file.\n", 955 ERR("%s: Error. %s:%i file \"%s\" is a binary file.",
956 progname, file_in, line, filename); 956 progname, file_in, line, filename);
957 exit(-1); 957 exit(-1);
958 } 958 }
@@ -1251,8 +1251,8 @@ st_styles_style_name(void)
1251 { 1251 {
1252 if ((stl != tstl) && (!strcmp(stl->name, tstl->name))) 1252 if ((stl != tstl) && (!strcmp(stl->name, tstl->name)))
1253 { 1253 {
1254 fprintf(stderr, "%s: Error. parse error %s:%i. There is already a style named \"%s\"\n", 1254 ERR("%s: Error. parse error %s:%i. There is already a style named \"%s\"",
1255 progname, file_in, line - 1, stl->name); 1255 progname, file_in, line - 1, stl->name);
1256 exit(-1); 1256 exit(-1);
1257 } 1257 }
1258 } 1258 }
@@ -1278,8 +1278,8 @@ st_styles_style_base(void)
1278 stl = eina_list_data_get(eina_list_last(edje_file->styles)); 1278 stl = eina_list_data_get(eina_list_last(edje_file->styles));
1279 if (stl->tags) 1279 if (stl->tags)
1280 { 1280 {
1281 fprintf(stderr, "%s: Error. parse error %s:%i. There is already a basic format for the style\n", 1281 ERR("%s: Error. parse error %s:%i. There is already a basic format for the style",
1282 progname, file_in, line - 1); 1282 progname, file_in, line - 1);
1283 exit(-1); 1283 exit(-1);
1284 } 1284 }
1285 tag = mem_alloc(SZ(Edje_Style_Tag)); 1285 tag = mem_alloc(SZ(Edje_Style_Tag));
@@ -1596,8 +1596,8 @@ ob_collections_group_script(void)
1596 cd->l2 = get_verbatim_line2(); 1596 cd->l2 = get_verbatim_line2();
1597 if (cd->shared) 1597 if (cd->shared)
1598 { 1598 {
1599 fprintf(stderr, "%s: Error. parse error %s:%i. There is already an existing script section for the group\n", 1599 ERR("%s: Error. parse error %s:%i. There is already an existing script section for the group",
1600 progname, file_in, line - 1); 1600 progname, file_in, line - 1);
1601 exit(-1); 1601 exit(-1);
1602 } 1602 }
1603 cd->shared = s; 1603 cd->shared = s;
@@ -1628,8 +1628,8 @@ ob_collections_group_lua_script(void)
1628 cd->l2 = get_verbatim_line2(); 1628 cd->l2 = get_verbatim_line2();
1629 if (cd->shared) 1629 if (cd->shared)
1630 { 1630 {
1631 fprintf(stderr, "%s: Error. parse error %s:%i. There is already an existing script section for the group\n", 1631 ERR("%s: Error. parse error %s:%i. There is already an existing script section for the group",
1632 progname, file_in, line - 1); 1632 progname, file_in, line - 1);
1633 exit(-1); 1633 exit(-1);
1634 } 1634 }
1635 cd->shared = s; 1635 cd->shared = s;
@@ -1742,8 +1742,8 @@ st_collections_group_parts_part_name(void)
1742 { 1742 {
1743 if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name))) 1743 if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name)))
1744 { 1744 {
1745 fprintf(stderr, "%s: Error. parse error %s:%i. There is already a part of the name %s\n", 1745 ERR("%s: Error. parse error %s:%i. There is already a part of the name %s",
1746 progname, file_in, line - 1, ep->name); 1746 progname, file_in, line - 1, ep->name);
1747 exit(-1); 1747 exit(-1);
1748 } 1748 }
1749 } 1749 }
@@ -2505,9 +2505,9 @@ static void ob_collections_group_parts_part_box_items_item(void)
2505 2505
2506 if ((ep->type != EDJE_PART_TYPE_BOX) && (ep->type != EDJE_PART_TYPE_TABLE)) 2506 if ((ep->type != EDJE_PART_TYPE_BOX) && (ep->type != EDJE_PART_TYPE_TABLE))
2507 { 2507 {
2508 fprintf(stderr, "%s: Error. parse error %s:%i. " 2508 ERR("%s: Error. parse error %s:%i. "
2509 "box attributes in non-BOX or TABLE part.\n", 2509 "box attributes in non-BOX or TABLE part.",
2510 progname, file_in, line - 1); 2510 progname, file_in, line - 1);
2511 exit(-1); 2511 exit(-1);
2512 } 2512 }
2513 2513
@@ -2569,9 +2569,9 @@ static void st_collections_group_parts_part_box_items_item_type(void)
2569 s = parse_str(0); 2569 s = parse_str(0);
2570 if (strcmp(s, "GROUP")) 2570 if (strcmp(s, "GROUP"))
2571 { 2571 {
2572 fprintf(stderr, "%s: Error. parse error %s:%i. " 2572 ERR("%s: Error. parse error %s:%i. "
2573 "token %s not one of: GROUP.\n", 2573 "token %s not one of: GROUP.",
2574 progname, file_in, line - 1, s); 2574 progname, file_in, line - 1, s);
2575 exit(-1); 2575 exit(-1);
2576 } 2576 }
2577 /* FIXME: handle the enum, once everything else is supported */ 2577 /* FIXME: handle the enum, once everything else is supported */
@@ -2892,12 +2892,12 @@ static void st_collections_group_parts_part_table_items_item_position(void)
2892 2892
2893 if (ep->type != EDJE_PART_TYPE_TABLE) 2893 if (ep->type != EDJE_PART_TYPE_TABLE)
2894 { 2894 {
2895 fprintf(stderr, "%s: Error. parse error %s:%i. " 2895 ERR("%s: Error. parse error %s:%i. "
2896 "table attributes in non-TABLE part.\n", 2896 "table attributes in non-TABLE part.",
2897 progname, file_in, line - 1); 2897 progname, file_in, line - 1);
2898 exit(-1); 2898 exit(-1);
2899 } 2899 }
2900 2900
2901 item = eina_list_data_get(eina_list_last(ep->items)); 2901 item = eina_list_data_get(eina_list_last(ep->items));
2902 item->col = parse_int_range(0, 0, 0xffff); 2902 item->col = parse_int_range(0, 0, 0xffff);
2903 item->row = parse_int_range(1, 0, 0xffff); 2903 item->row = parse_int_range(1, 0, 0xffff);
@@ -2927,9 +2927,9 @@ static void st_collections_group_parts_part_table_items_item_span(void)
2927 2927
2928 if (ep->type != EDJE_PART_TYPE_TABLE) 2928 if (ep->type != EDJE_PART_TYPE_TABLE)
2929 { 2929 {
2930 fprintf(stderr, "%s: Error. parse error %s:%i. " 2930 ERR("%s: Error. parse error %s:%i. "
2931 "table attributes in non-TABLE part.\n", 2931 "table attributes in non-TABLE part.",
2932 progname, file_in, line - 1); 2932 progname, file_in, line - 1);
2933 exit(-1); 2933 exit(-1);
2934 } 2934 }
2935 2935
@@ -3088,9 +3088,9 @@ st_collections_group_parts_part_description_inherit(void)
3088 /* inherit may not be used in the default description */ 3088 /* inherit may not be used in the default description */
3089 if (!ep->other_desc) 3089 if (!ep->other_desc)
3090 { 3090 {
3091 fprintf(stderr, "%s: Error. parse error %s:%i. " 3091 ERR("%s: Error. parse error %s:%i. "
3092 "inherit may not be used in the default description\n", 3092 "inherit may not be used in the default description",
3093 progname, file_in, line - 1); 3093 progname, file_in, line - 1);
3094 exit(-1); 3094 exit(-1);
3095 } 3095 }
3096 3096
@@ -3098,9 +3098,9 @@ st_collections_group_parts_part_description_inherit(void)
3098 3098
3099 if (!ed->state.name) 3099 if (!ed->state.name)
3100 { 3100 {
3101 fprintf(stderr, "%s: Error. parse error %s:%i. " 3101 ERR("%s: Error. parse error %s:%i. "
3102 "inherit may only be used after state\n", 3102 "inherit may only be used after state",
3103 progname, file_in, line - 1); 3103 progname, file_in, line - 1);
3104 exit(-1); 3104 exit(-1);
3105 } 3105 }
3106 3106
@@ -3139,9 +3139,9 @@ st_collections_group_parts_part_description_inherit(void)
3139 3139
3140 if (!parent) 3140 if (!parent)
3141 { 3141 {
3142 fprintf (stderr, "%s: Error. parse error %s:%i. " 3142 ERR("%s: Error. parse error %s:%i. "
3143 "cannot find referenced part state %s %lf\n", 3143 "cannot find referenced part state %s %lf",
3144 ep->name, file_in, line - 1, parent_name, parent_val); 3144 ep->name, file_in, line - 1, parent_name, parent_val);
3145 exit(-1); 3145 exit(-1);
3146 } 3146 }
3147 3147
@@ -3235,9 +3235,9 @@ st_collections_group_parts_part_description_state(void)
3235 s = parse_str(0); 3235 s = parse_str(0);
3236 if (!strcmp (s, "custom")) 3236 if (!strcmp (s, "custom"))
3237 { 3237 {
3238 fprintf(stderr, "%s: Error. parse error %s:%i. " 3238 ERR("%s: Error. parse error %s:%i. "
3239 "invalid state name: '%s'.\n", 3239 "invalid state name: '%s'.",
3240 progname, file_in, line - 1, s); 3240 progname, file_in, line - 1, s);
3241 exit(-1); 3241 exit(-1);
3242 } 3242 }
3243 3243
@@ -3914,9 +3914,9 @@ st_collections_group_parts_part_description_image_normal(void)
3914 3914
3915 if (ep->type != EDJE_PART_TYPE_IMAGE) 3915 if (ep->type != EDJE_PART_TYPE_IMAGE)
3916 { 3916 {
3917 fprintf(stderr, "%s: Error. parse error %s:%i. " 3917 ERR("%s: Error. parse error %s:%i. "
3918 "image attributes in non-IMAGE part.\n", 3918 "image attributes in non-IMAGE part.",
3919 progname, file_in, line - 1); 3919 progname, file_in, line - 1);
3920 exit(-1); 3920 exit(-1);
3921 } 3921 }
3922 3922
@@ -3957,9 +3957,9 @@ st_collections_group_parts_part_description_image_tween(void)
3957 3957
3958 if (ep->type != EDJE_PART_TYPE_IMAGE) 3958 if (ep->type != EDJE_PART_TYPE_IMAGE)
3959 { 3959 {
3960 fprintf(stderr, "%s: Error. parse error %s:%i. " 3960 ERR("%s: Error. parse error %s:%i. "
3961 "image attributes in non-IMAGE part.\n", 3961 "image attributes in non-IMAGE part.",
3962 progname, file_in, line - 1); 3962 progname, file_in, line - 1);
3963 exit(-1); 3963 exit(-1);
3964 } 3964 }
3965 3965
@@ -4003,9 +4003,9 @@ st_collections_group_parts_part_description_image_border(void)
4003 4003
4004 if (ep->type != EDJE_PART_TYPE_IMAGE) 4004 if (ep->type != EDJE_PART_TYPE_IMAGE)
4005 { 4005 {
4006 fprintf(stderr, "%s: Error. parse error %s:%i. " 4006 ERR("%s: Error. parse error %s:%i. "
4007 "image attributes in non-IMAGE part.\n", 4007 "image attributes in non-IMAGE part.",
4008 progname, file_in, line - 1); 4008 progname, file_in, line - 1);
4009 exit(-1); 4009 exit(-1);
4010 } 4010 }
4011 4011
@@ -4043,9 +4043,9 @@ st_collections_group_parts_part_description_image_middle(void)
4043 4043
4044 if (ep->type != EDJE_PART_TYPE_IMAGE) 4044 if (ep->type != EDJE_PART_TYPE_IMAGE)
4045 { 4045 {
4046 fprintf(stderr, "%s: Error. parse error %s:%i. " 4046 ERR("%s: Error. parse error %s:%i. "
4047 "image attributes in non-IMAGE part.\n", 4047 "image attributes in non-IMAGE part.",
4048 progname, file_in, line - 1); 4048 progname, file_in, line - 1);
4049 exit(-1); 4049 exit(-1);
4050 } 4050 }
4051 4051
@@ -4085,9 +4085,9 @@ st_collections_group_parts_part_description_image_scale_hint(void)
4085 4085
4086 if (ep->type != EDJE_PART_TYPE_IMAGE) 4086 if (ep->type != EDJE_PART_TYPE_IMAGE)
4087 { 4087 {
4088 fprintf(stderr, "%s: Error. parse error %s:%i. " 4088 ERR("%s: Error. parse error %s:%i. "
4089 "image attributes in non-IMAGE part.\n", 4089 "image attributes in non-IMAGE part.",
4090 progname, file_in, line - 1); 4090 progname, file_in, line - 1);
4091 exit(-1); 4091 exit(-1);
4092 } 4092 }
4093 4093
@@ -4149,9 +4149,9 @@ st_collections_group_parts_part_description_fill_smooth(void)
4149 4149
4150 if (ep->type != EDJE_PART_TYPE_IMAGE) 4150 if (ep->type != EDJE_PART_TYPE_IMAGE)
4151 { 4151 {
4152 fprintf(stderr, "%s: Error. parse error %s:%i. " 4152 ERR("%s: Error. parse error %s:%i. "
4153 "fill.type attribute in non-IMAGE part.\n", 4153 "fill.type attribute in non-IMAGE part.",
4154 progname, file_in, line - 1); 4154 progname, file_in, line - 1);
4155 exit(-1); 4155 exit(-1);
4156 } 4156 }
4157 4157
@@ -4224,9 +4224,9 @@ st_collections_group_parts_part_description_fill_angle(void)
4224 /* XXX this will need to include IMAGES when angle support is added to evas images */ 4224 /* XXX this will need to include IMAGES when angle support is added to evas images */
4225 if (ep->type != EDJE_PART_TYPE_GRADIENT) 4225 if (ep->type != EDJE_PART_TYPE_GRADIENT)
4226 { 4226 {
4227 fprintf(stderr, "%s: Error. parse error %s:%i. " 4227 ERR("%s: Error. parse error %s:%i. "
4228 "gradient attributes in non-GRADIENT part.\n", 4228 "gradient attributes in non-GRADIENT part.",
4229 progname, file_in, line - 1); 4229 progname, file_in, line - 1);
4230 exit(-1); 4230 exit(-1);
4231 } 4231 }
4232 4232
@@ -4262,9 +4262,9 @@ st_collections_group_parts_part_description_fill_type(void)
4262 4262
4263 if (ep->type != EDJE_PART_TYPE_IMAGE) 4263 if (ep->type != EDJE_PART_TYPE_IMAGE)
4264 { 4264 {
4265 fprintf(stderr, "%s: Error. parse error %s:%i. " 4265 ERR("%s: Error. parse error %s:%i. "
4266 "fill attributes in non-IMAGE part.\n", 4266 "fill attributes in non-IMAGE part.",
4267 progname, file_in, line - 1); 4267 progname, file_in, line - 1);
4268 exit(-1); 4268 exit(-1);
4269 } 4269 }
4270 4270
@@ -4319,9 +4319,9 @@ st_collections_group_parts_part_description_fill_origin_relative(void)
4319 4319
4320 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) 4320 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
4321 { 4321 {
4322 fprintf(stderr, "%s: Error. parse error %s:%i. " 4322 ERR("%s: Error. parse error %s:%i. "
4323 "fill attributes in non-IMAGE part.\n", 4323 "fill attributes in non-IMAGE part.",
4324 progname, file_in, line - 1); 4324 progname, file_in, line - 1);
4325 exit(-1); 4325 exit(-1);
4326 } 4326 }
4327 4327
@@ -4355,9 +4355,9 @@ st_collections_group_parts_part_description_fill_origin_offset(void)
4355 4355
4356 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) 4356 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
4357 { 4357 {
4358 fprintf(stderr, "%s: Error. parse error %s:%i. " 4358 ERR("%s: Error. parse error %s:%i. "
4359 "fill attributes in non-IMAGE part.\n", 4359 "fill attributes in non-IMAGE part.",
4360 progname, file_in, line - 1); 4360 progname, file_in, line - 1);
4361 exit(-1); 4361 exit(-1);
4362 } 4362 }
4363 4363
@@ -4416,9 +4416,9 @@ st_collections_group_parts_part_description_fill_size_relative(void)
4416 4416
4417 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) 4417 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
4418 { 4418 {
4419 fprintf(stderr, "%s: Error. parse error %s:%i. " 4419 ERR("%s: Error. parse error %s:%i. "
4420 "fill attributes in non-IMAGE part.\n", 4420 "fill attributes in non-IMAGE part.",
4421 progname, file_in, line - 1); 4421 progname, file_in, line - 1);
4422 exit(-1); 4422 exit(-1);
4423 } 4423 }
4424 4424
@@ -4452,9 +4452,9 @@ st_collections_group_parts_part_description_fill_size_offset(void)
4452 4452
4453 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT) 4453 if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
4454 { 4454 {
4455 fprintf(stderr, "%s: Error. parse error %s:%i. " 4455 ERR("%s: Error. parse error %s:%i. "
4456 "fill attributes in non-IMAGE part.\n", 4456 "fill attributes in non-IMAGE part.",
4457 progname, file_in, line - 1); 4457 progname, file_in, line - 1);
4458 exit(-1); 4458 exit(-1);
4459 } 4459 }
4460 4460
@@ -4515,9 +4515,9 @@ st_collections_group_parts_part_description_text_text(void)
4515 if ((ep->type != EDJE_PART_TYPE_TEXT) && 4515 if ((ep->type != EDJE_PART_TYPE_TEXT) &&
4516 (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) 4516 (ep->type != EDJE_PART_TYPE_TEXTBLOCK))
4517 { 4517 {
4518 fprintf(stderr, "%s: Error. parse error %s:%i. " 4518 ERR("%s: Error. parse error %s:%i. "
4519 "text attributes in non-TEXT part.\n", 4519 "text attributes in non-TEXT part.",
4520 progname, file_in, line - 1); 4520 progname, file_in, line - 1);
4521 exit(-1); 4521 exit(-1);
4522 } 4522 }
4523 4523
@@ -4567,9 +4567,9 @@ st_collections_group_parts_part_description_text_text_class(void)
4567 if ((ep->type != EDJE_PART_TYPE_TEXT) && 4567 if ((ep->type != EDJE_PART_TYPE_TEXT) &&
4568 (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) 4568 (ep->type != EDJE_PART_TYPE_TEXTBLOCK))
4569 { 4569 {
4570 fprintf(stderr, "%s: Error. parse error %s:%i. " 4570 ERR("%s: Error. parse error %s:%i. "
4571 "text attributes in non-TEXT part.\n", 4571 "text attributes in non-TEXT part.",
4572 progname, file_in, line - 1); 4572 progname, file_in, line - 1);
4573 exit(-1); 4573 exit(-1);
4574 } 4574 }
4575 4575
@@ -4604,9 +4604,9 @@ st_collections_group_parts_part_description_text_font(void)
4604 4604
4605 if (ep->type != EDJE_PART_TYPE_TEXT) 4605 if (ep->type != EDJE_PART_TYPE_TEXT)
4606 { 4606 {
4607 fprintf(stderr, "%s: Error. parse error %s:%i. " 4607 ERR("%s: Error. parse error %s:%i. "
4608 "text attributes in non-TEXT part.\n", 4608 "text attributes in non-TEXT part.",
4609 progname, file_in, line - 1); 4609 progname, file_in, line - 1);
4610 exit(-1); 4610 exit(-1);
4611 } 4611 }
4612 4612
@@ -4641,9 +4641,9 @@ st_collections_group_parts_part_description_text_style(void)
4641 4641
4642 if (ep->type != EDJE_PART_TYPE_TEXTBLOCK) 4642 if (ep->type != EDJE_PART_TYPE_TEXTBLOCK)
4643 { 4643 {
4644 fprintf(stderr, "%s: Error. parse error %s:%i. " 4644 ERR("%s: Error. parse error %s:%i. "
4645 "text attributes in non-TEXTBLOCK part.\n", 4645 "text attributes in non-TEXTBLOCK part.",
4646 progname, file_in, line - 1); 4646 progname, file_in, line - 1);
4647 exit(-1); 4647 exit(-1);
4648 } 4648 }
4649 4649
@@ -4679,9 +4679,9 @@ st_collections_group_parts_part_description_text_repch(void)
4679 4679
4680 if (ep->type != EDJE_PART_TYPE_TEXTBLOCK) 4680 if (ep->type != EDJE_PART_TYPE_TEXTBLOCK)
4681 { 4681 {
4682 fprintf(stderr, "%s: Error. parse error %s:%i. " 4682 ERR("%s: Error. parse error %s:%i. "
4683 "text attributes in non-TEXTBLOCK part.\n", 4683 "text attributes in non-TEXTBLOCK part.",
4684 progname, file_in, line - 1); 4684 progname, file_in, line - 1);
4685 exit(-1); 4685 exit(-1);
4686 } 4686 }
4687 4687
@@ -4716,9 +4716,9 @@ st_collections_group_parts_part_description_text_size(void)
4716 4716
4717 if (ep->type != EDJE_PART_TYPE_TEXT) 4717 if (ep->type != EDJE_PART_TYPE_TEXT)
4718 { 4718 {
4719 fprintf(stderr, "%s: Error. parse error %s:%i. " 4719 ERR("%s: Error. parse error %s:%i. "
4720 "text attributes in non-TEXT part.\n", 4720 "text attributes in non-TEXT part.",
4721 progname, file_in, line - 1); 4721 progname, file_in, line - 1);
4722 exit(-1); 4722 exit(-1);
4723 } 4723 }
4724 4724
@@ -4753,9 +4753,9 @@ st_collections_group_parts_part_description_text_fit(void)
4753 4753
4754 if (ep->type != EDJE_PART_TYPE_TEXT) 4754 if (ep->type != EDJE_PART_TYPE_TEXT)
4755 { 4755 {
4756 fprintf(stderr, "%s: Error. parse error %s:%i. " 4756 ERR("%s: Error. parse error %s:%i. "
4757 "text attributes in non-TEXT part.\n", 4757 "text attributes in non-TEXT part.",
4758 progname, file_in, line - 1); 4758 progname, file_in, line - 1);
4759 exit(-1); 4759 exit(-1);
4760 } 4760 }
4761 4761
@@ -4793,9 +4793,9 @@ st_collections_group_parts_part_description_text_min(void)
4793 if ((ep->type != EDJE_PART_TYPE_TEXT) && 4793 if ((ep->type != EDJE_PART_TYPE_TEXT) &&
4794 (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) 4794 (ep->type != EDJE_PART_TYPE_TEXTBLOCK))
4795 { 4795 {
4796 fprintf(stderr, "%s: Error. parse error %s:%i. " 4796 ERR("%s: Error. parse error %s:%i. "
4797 "text attributes in non-TEXT part.\n", 4797 "text attributes in non-TEXT part.",
4798 progname, file_in, line - 1); 4798 progname, file_in, line - 1);
4799 exit(-1); 4799 exit(-1);
4800 } 4800 }
4801 4801
@@ -4833,9 +4833,9 @@ st_collections_group_parts_part_description_text_max(void)
4833 if ((ep->type != EDJE_PART_TYPE_TEXT) && 4833 if ((ep->type != EDJE_PART_TYPE_TEXT) &&
4834 (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) 4834 (ep->type != EDJE_PART_TYPE_TEXTBLOCK))
4835 { 4835 {
4836 fprintf(stderr, "%s: Error. parse error %s:%i. " 4836 ERR("%s: Error. parse error %s:%i. "
4837 "text attributes in non-TEXT part.\n", 4837 "text attributes in non-TEXT part.",
4838 progname, file_in, line - 1); 4838 progname, file_in, line - 1);
4839 exit(-1); 4839 exit(-1);
4840 } 4840 }
4841 4841
@@ -4871,9 +4871,9 @@ st_collections_group_parts_part_description_text_align(void)
4871 4871
4872 if (ep->type != EDJE_PART_TYPE_TEXT) 4872 if (ep->type != EDJE_PART_TYPE_TEXT)
4873 { 4873 {
4874 fprintf(stderr, "%s: Error. parse error %s:%i. " 4874 ERR("%s: Error. parse error %s:%i. "
4875 "text attributes in non-TEXT part.\n", 4875 "text attributes in non-TEXT part.",
4876 progname, file_in, line - 1); 4876 progname, file_in, line - 1);
4877 exit(-1); 4877 exit(-1);
4878 } 4878 }
4879 4879
@@ -4910,9 +4910,9 @@ st_collections_group_parts_part_description_text_source(void)
4910 if ((ep->type != EDJE_PART_TYPE_TEXT) && 4910 if ((ep->type != EDJE_PART_TYPE_TEXT) &&
4911 (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) 4911 (ep->type != EDJE_PART_TYPE_TEXTBLOCK))
4912 { 4912 {
4913 fprintf(stderr, "%s: Error. parse error %s:%i. " 4913 ERR("%s: Error. parse error %s:%i. "
4914 "text attributes in non-TEXT part.\n", 4914 "text attributes in non-TEXT part.",
4915 progname, file_in, line - 1); 4915 progname, file_in, line - 1);
4916 exit(-1); 4916 exit(-1);
4917 } 4917 }
4918 4918
@@ -4954,9 +4954,9 @@ st_collections_group_parts_part_description_text_text_source(void)
4954 if ((ep->type != EDJE_PART_TYPE_TEXT) && 4954 if ((ep->type != EDJE_PART_TYPE_TEXT) &&
4955 (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) 4955 (ep->type != EDJE_PART_TYPE_TEXTBLOCK))
4956 { 4956 {
4957 fprintf(stderr, "%s: Error. parse error %s:%i. " 4957 ERR("%s: Error. parse error %s:%i. "
4958 "text attributes in non-TEXT part.\n", 4958 "text attributes in non-TEXT part.",
4959 progname, file_in, line - 1); 4959 progname, file_in, line - 1);
4960 exit(-1); 4960 exit(-1);
4961 } 4961 }
4962 4962
@@ -4998,9 +4998,9 @@ st_collections_group_parts_part_description_text_elipsis(void)
4998 4998
4999 if (ep->type != EDJE_PART_TYPE_TEXT) 4999 if (ep->type != EDJE_PART_TYPE_TEXT)
5000 { 5000 {
5001 fprintf(stderr, "%s: Error. parse error %s:%i. " 5001 ERR("%s: Error. parse error %s:%i. "
5002 "text attributes in non-TEXT part.\n", 5002 "text attributes in non-TEXT part.",
5003 progname, file_in, line - 1); 5003 progname, file_in, line - 1);
5004 exit(-1); 5004 exit(-1);
5005 } 5005 }
5006 5006
@@ -5068,9 +5068,9 @@ st_collections_group_parts_part_description_gradient_type(void)
5068 5068
5069 if (ep->type != EDJE_PART_TYPE_GRADIENT) 5069 if (ep->type != EDJE_PART_TYPE_GRADIENT)
5070 { 5070 {
5071 fprintf(stderr, "%s: Error. parse error %s:%i. " 5071 ERR("%s: Error. parse error %s:%i. "
5072 "gradient attributes in non-GRADIENT part.\n", 5072 "gradient attributes in non-GRADIENT part.",
5073 progname, file_in, line - 1); 5073 progname, file_in, line - 1);
5074 exit(-1); 5074 exit(-1);
5075 } 5075 }
5076 5076
@@ -5105,9 +5105,9 @@ st_collections_group_parts_part_description_gradient_spectrum(void)
5105 5105
5106 if (ep->type != EDJE_PART_TYPE_GRADIENT) 5106 if (ep->type != EDJE_PART_TYPE_GRADIENT)
5107 { 5107 {
5108 fprintf(stderr, "%s: Error. parse error %s:%i. " 5108 ERR("%s: Error. parse error %s:%i. "
5109 "gradient attributes in non-GRADIENT part.\n", 5109 "gradient attributes in non-GRADIENT part.",
5110 progname, file_in, line - 1); 5110 progname, file_in, line - 1);
5111 exit(-1); 5111 exit(-1);
5112 } 5112 }
5113 5113
@@ -5150,9 +5150,9 @@ st_collections_group_parts_part_description_gradient_rel1_relative(void)
5150 5150
5151 if (ep->type != EDJE_PART_TYPE_GRADIENT) 5151 if (ep->type != EDJE_PART_TYPE_GRADIENT)
5152 { 5152 {
5153 fprintf(stderr, "%s: Error. parse error %s:%i. " 5153 ERR("%s: Error. parse error %s:%i. "
5154 "gradient attributes in non-GRADIENT part.\n", 5154 "gradient attributes in non-GRADIENT part.",
5155 progname, file_in, line - 1); 5155 progname, file_in, line - 1);
5156 exit(-1); 5156 exit(-1);
5157 } 5157 }
5158 5158
@@ -5193,9 +5193,9 @@ st_collections_group_parts_part_description_gradient_rel1_offset(void)
5193 5193
5194 if (ep->type != EDJE_PART_TYPE_GRADIENT) 5194 if (ep->type != EDJE_PART_TYPE_GRADIENT)
5195 { 5195 {
5196 fprintf(stderr, "%s: Error. parse error %s:%i. " 5196 ERR("%s: Error. parse error %s:%i. "
5197 "gradient attributes in non-GRADIENT part.\n", 5197 "gradient attributes in non-GRADIENT part.",
5198 progname, file_in, line - 1); 5198 progname, file_in, line - 1);
5199 exit(-1); 5199 exit(-1);
5200 } 5200 }
5201 5201
@@ -5223,12 +5223,12 @@ st_collections_group_parts_part_description_gradient_rel2_relative(void)
5223 5223
5224 if (ep->type != EDJE_PART_TYPE_GRADIENT) 5224 if (ep->type != EDJE_PART_TYPE_GRADIENT)
5225 { 5225 {
5226 fprintf(stderr, "%s: Error. parse error %s:%i. " 5226 ERR("%s: Error. parse error %s:%i. "
5227 "gradient attributes in non-GRADIENT part.\n", 5227 "gradient attributes in non-GRADIENT part.",
5228 progname, file_in, line - 1); 5228 progname, file_in, line - 1);
5229 exit(-1); 5229 exit(-1);
5230 } 5230 }
5231 5231
5232 ed = ep->default_desc; 5232 ed = ep->default_desc;
5233 if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc)); 5233 if (ep->other_desc) ed = eina_list_data_get(eina_list_last(ep->other_desc));
5234 5234
@@ -5253,9 +5253,9 @@ st_collections_group_parts_part_description_gradient_rel2_offset(void)
5253 5253
5254 if (ep->type != EDJE_PART_TYPE_GRADIENT) 5254 if (ep->type != EDJE_PART_TYPE_GRADIENT)
5255 { 5255 {
5256 fprintf(stderr, "%s: Error. parse error %s:%i. " 5256 ERR("%s: Error. parse error %s:%i. "
5257 "gradient attributes in non-GRADIENT part.\n", 5257 "gradient attributes in non-GRADIENT part.",
5258 progname, file_in, line - 1); 5258 progname, file_in, line - 1);
5259 exit(-1); 5259 exit(-1);
5260 } 5260 }
5261 5261
@@ -5354,9 +5354,9 @@ static void st_collections_group_parts_part_description_box_layout(void)
5354 5354
5355 if (ep->type != EDJE_PART_TYPE_BOX) 5355 if (ep->type != EDJE_PART_TYPE_BOX)
5356 { 5356 {
5357 fprintf(stderr, "%s: Error. parse error %s:%i. " 5357 ERR("%s: Error. parse error %s:%i. "
5358 "box attributes in non-BOX part.\n", 5358 "box attributes in non-BOX part.",
5359 progname, file_in, line - 1); 5359 progname, file_in, line - 1);
5360 exit(-1); 5360 exit(-1);
5361 } 5361 }
5362 5362
@@ -5380,9 +5380,9 @@ static void st_collections_group_parts_part_description_box_align(void)
5380 5380
5381 if (ep->type != EDJE_PART_TYPE_BOX) 5381 if (ep->type != EDJE_PART_TYPE_BOX)
5382 { 5382 {
5383 fprintf(stderr, "%s: Error. parse error %s:%i. " 5383 ERR("%s: Error. parse error %s:%i. "
5384 "box attributes in non-BOX part.\n", 5384 "box attributes in non-BOX part.",
5385 progname, file_in, line - 1); 5385 progname, file_in, line - 1);
5386 exit(-1); 5386 exit(-1);
5387 } 5387 }
5388 5388
@@ -5405,9 +5405,9 @@ static void st_collections_group_parts_part_description_box_padding(void)
5405 5405
5406 if (ep->type != EDJE_PART_TYPE_BOX) 5406 if (ep->type != EDJE_PART_TYPE_BOX)
5407 { 5407 {
5408 fprintf(stderr, "%s: Error. parse error %s:%i. " 5408 ERR("%s: Error. parse error %s:%i. "
5409 "box attributes in non-BOX part.\n", 5409 "box attributes in non-BOX part.",
5410 progname, file_in, line - 1); 5410 progname, file_in, line - 1);
5411 exit(-1); 5411 exit(-1);
5412 } 5412 }
5413 5413
@@ -5431,9 +5431,9 @@ st_collections_group_parts_part_description_box_min(void)
5431 5431
5432 if (ep->type != EDJE_PART_TYPE_BOX) 5432 if (ep->type != EDJE_PART_TYPE_BOX)
5433 { 5433 {
5434 fprintf(stderr, "%s: Error. parse error %s:%i. " 5434 ERR("%s: Error. parse error %s:%i. "
5435 "box attributes in non-BOX part.\n", 5435 "box attributes in non-BOX part.",
5436 progname, file_in, line - 1); 5436 progname, file_in, line - 1);
5437 exit(-1); 5437 exit(-1);
5438 } 5438 }
5439 5439
@@ -5507,9 +5507,9 @@ static void st_collections_group_parts_part_description_table_homogeneous(void)
5507 5507
5508 if (ep->type != EDJE_PART_TYPE_TABLE) 5508 if (ep->type != EDJE_PART_TYPE_TABLE)
5509 { 5509 {
5510 fprintf(stderr, "%s: Error. parse error %s:%i. " 5510 ERR("%s: Error. parse error %s:%i. "
5511 "table attributes in non-TABLE part.\n", 5511 "table attributes in non-TABLE part.",
5512 progname, file_in, line - 1); 5512 progname, file_in, line - 1);
5513 exit(-1); 5513 exit(-1);
5514 } 5514 }
5515 5515
@@ -5535,9 +5535,9 @@ static void st_collections_group_parts_part_description_table_align(void)
5535 5535
5536 if (ep->type != EDJE_PART_TYPE_TABLE) 5536 if (ep->type != EDJE_PART_TYPE_TABLE)
5537 { 5537 {
5538 fprintf(stderr, "%s: Error. parse error %s:%i. " 5538 ERR("%s: Error. parse error %s:%i. "
5539 "table attributes in non-TABLE part.\n", 5539 "table attributes in non-TABLE part.",
5540 progname, file_in, line - 1); 5540 progname, file_in, line - 1);
5541 exit(-1); 5541 exit(-1);
5542 } 5542 }
5543 5543
@@ -5560,9 +5560,9 @@ static void st_collections_group_parts_part_description_table_padding(void)
5560 5560
5561 if (ep->type != EDJE_PART_TYPE_TABLE) 5561 if (ep->type != EDJE_PART_TYPE_TABLE)
5562 { 5562 {
5563 fprintf(stderr, "%s: Error. parse error %s:%i. " 5563 ERR("%s: Error. parse error %s:%i. "
5564 "table attributes in non-TABLE part.\n", 5564 "table attributes in non-TABLE part.",
5565 progname, file_in, line - 1); 5565 progname, file_in, line - 1);
5566 exit(-1); 5566 exit(-1);
5567 } 5567 }
5568 5568
@@ -5590,9 +5590,9 @@ _st_collections_group_parts_part_description_params(Edje_External_Param_Type typ
5590 5590
5591 if (ep->type != EDJE_PART_TYPE_EXTERNAL) 5591 if (ep->type != EDJE_PART_TYPE_EXTERNAL)
5592 { 5592 {
5593 fprintf(stderr, "%s: Error. parse error %s:%i. " 5593 ERR("%s: Error. parse error %s:%i. "
5594 "params in non-EXTERNAL part.\n", 5594 "params in non-EXTERNAL part.",
5595 progname, file_in, line - 1); 5595 progname, file_in, line - 1);
5596 exit(-1); 5596 exit(-1);
5597 } 5597 }
5598 5598
@@ -5759,8 +5759,8 @@ st_collections_group_programs_program_name(void)
5759 { 5759 {
5760 if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name))) 5760 if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name)))
5761 { 5761 {
5762 fprintf(stderr, "%s: Error. parse error %s:%i. There is already a program of the name %s\n", 5762 ERR("%s: Error. parse error %s:%i. There is already a program of the name %s\n",
5763 progname, file_in, line - 1, ep->name); 5763 progname, file_in, line - 1, ep->name);
5764 exit(-1); 5764 exit(-1);
5765 } 5765 }
5766 } 5766 }
@@ -6002,9 +6002,9 @@ st_collections_group_programs_program_target(void)
6002 data_queue_part_lookup(pc, name, &(et->id)); 6002 data_queue_part_lookup(pc, name, &(et->id));
6003 else 6003 else
6004 { 6004 {
6005 fprintf(stderr, "%s: Error. parse error %s:%i. " 6005 ERR("%s: Error. parse error %s:%i. "
6006 "target may only be used after action\n", 6006 "target may only be used after action",
6007 progname, file_in, line - 1); 6007 progname, file_in, line - 1);
6008 exit(-1); 6008 exit(-1);
6009 } 6009 }
6010 free(name); 6010 free(name);
@@ -6076,8 +6076,8 @@ ob_collections_group_programs_program_script(void)
6076 cp->script = s; 6076 cp->script = s;
6077 if (cd->shared && cd->is_lua) 6077 if (cd->shared && cd->is_lua)
6078 { 6078 {
6079 fprintf(stderr, "%s: Error. parse error %s:%i. You're trying to mix Embryo and Lua scripting in the same group\n", 6079 ERR("%s: Error. parse error %s:%i. You're trying to mix Embryo and Lua scripting in the same group",
6080 progname, file_in, line - 1); 6080 progname, file_in, line - 1);
6081 exit(-1); 6081 exit(-1);
6082 } 6082 }
6083 cd->is_lua = 0; 6083 cd->is_lua = 0;
@@ -6116,8 +6116,8 @@ ob_collections_group_programs_program_lua_script(void)
6116 cp->script = s; 6116 cp->script = s;
6117 if (cd->shared && !cd->is_lua) 6117 if (cd->shared && !cd->is_lua)
6118 { 6118 {
6119 fprintf(stderr, "%s: Error. parse error %s:%i. You're trying to mix Embryo and Lua scripting in the same group\n", 6119 ERR("%s: Error. parse error %s:%i. You're trying to mix Embryo and Lua scripting in the same group",
6120 progname, file_in, line - 1); 6120 progname, file_in, line - 1);
6121 exit(-1); 6121 exit(-1);
6122 } 6122 }
6123 cd->is_lua = 1; 6123 cd->is_lua = 1;
diff --git a/legacy/edje/src/bin/edje_cc_mem.c b/legacy/edje/src/bin/edje_cc_mem.c
index be611ce562..082d570abb 100644
--- a/legacy/edje/src/bin/edje_cc_mem.c
+++ b/legacy/edje/src/bin/edje_cc_mem.c
@@ -18,8 +18,8 @@ mem_alloc(size_t size)
18 18
19 mem = calloc(1, size); 19 mem = calloc(1, size);
20 if (mem) return mem; 20 if (mem) return mem;
21 fprintf(stderr, "%s: Error. %s:%i memory allocation of %i bytes failed. %s\n", 21 ERR("%s: Error. %s:%i memory allocation of %i bytes failed. %s",
22 progname, file_in, line, size, strerror(errno)); 22 progname, file_in, line, size, strerror(errno));
23 exit(-1); 23 exit(-1);
24 return NULL; 24 return NULL;
25} 25}
@@ -31,8 +31,8 @@ mem_strdup(const char *s)
31 31
32 str = strdup(s); 32 str = strdup(s);
33 if (str) return str; 33 if (str) return str;
34 fprintf(stderr, "%s: Error. %s:%i memory allocation of %i bytes failed. %s. string being duplicated: \"%s\"\n", 34 ERR("%s: Error. %s:%i memory allocation of %i bytes failed. %s. string being duplicated: \"%s\"",
35 progname, file_in, line, strlen(s) + 1, strerror(errno), s); 35 progname, file_in, line, strlen(s) + 1, strerror(errno), s);
36 exit(-1); 36 exit(-1);
37 return NULL; 37 return NULL;
38} 38}
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index d894b8851f..c1f5516e20 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -133,7 +133,7 @@ error_and_abort(Eet_File *ef, const char *fmt, ...)
133{ 133{
134 va_list ap; 134 va_list ap;
135 135
136 fprintf(stderr, "%s: Error. ", progname); 136 ERR("%s: Error. ", progname);
137 137
138 va_start(ap, fmt); 138 va_start(ap, fmt);
139 vfprintf(stderr, fmt, ap); 139 vfprintf(stderr, fmt, ap);
@@ -979,8 +979,8 @@ data_write(void)
979 ef = eet_open(file_out, EET_FILE_MODE_WRITE); 979 ef = eet_open(file_out, EET_FILE_MODE_WRITE);
980 if (!ef) 980 if (!ef)
981 { 981 {
982 fprintf(stderr, "%s: Error. Unable to open \"%s\" for writing output\n", 982 ERR("%s: Error. Unable to open \"%s\" for writing output",
983 progname, file_out); 983 progname, file_out);
984 exit(-1); 984 exit(-1);
985 } 985 }
986 986
@@ -1169,8 +1169,8 @@ data_process_lookups(void)
1169 } 1169 }
1170 if (!l) 1170 if (!l)
1171 { 1171 {
1172 fprintf(stderr, "%s: Error. Unable to find part name \"%s\".\n", 1172 ERR("%s: Error. Unable to find part name \"%s\".",
1173 progname, pl->name); 1173 progname, pl->name);
1174 exit(-1); 1174 exit(-1);
1175 } 1175 }
1176 part_lookups = eina_list_remove(part_lookups, pl); 1176 part_lookups = eina_list_remove(part_lookups, pl);
@@ -1195,8 +1195,8 @@ data_process_lookups(void)
1195 } 1195 }
1196 if (!l) 1196 if (!l)
1197 { 1197 {
1198 fprintf(stderr, "%s: Error. Unable to find program name \"%s\".\n", 1198 ERR("%s: Error. Unable to find program name \"%s\".",
1199 progname, pl->name); 1199 progname, pl->name);
1200 exit(-1); 1200 exit(-1);
1201 } 1201 }
1202 program_lookups = eina_list_remove(program_lookups, pl); 1202 program_lookups = eina_list_remove(program_lookups, pl);
@@ -1220,8 +1220,8 @@ data_process_lookups(void)
1220 } 1220 }
1221 if (!l) 1221 if (!l)
1222 { 1222 {
1223 fprintf(stderr, "%s: Error. Unable to find group name \"%s\".\n", 1223 ERR("%s: Error. Unable to find group name \"%s\".",
1224 progname, gl->name); 1224 progname, gl->name);
1225 exit(-1); 1225 exit(-1);
1226 } 1226 }
1227 group_lookups = eina_list_remove(group_lookups, gl); 1227 group_lookups = eina_list_remove(group_lookups, gl);
@@ -1256,8 +1256,8 @@ data_process_lookups(void)
1256 1256
1257 if (!l) 1257 if (!l)
1258 { 1258 {
1259 fprintf(stderr, "%s: Error. Unable to find image name \"%s\".\n", 1259 ERR("%s: Error. Unable to find image name \"%s\".",
1260 progname, il->name); 1260 progname, il->name);
1261 exit(-1); 1261 exit(-1);
1262 } 1262 }
1263 image_lookups = eina_list_remove(image_lookups, il); 1263 image_lookups = eina_list_remove(image_lookups, il);
@@ -1290,8 +1290,8 @@ data_process_lookups(void)
1290 1290
1291 if (!l) 1291 if (!l)
1292 { 1292 {
1293 fprintf(stderr, "%s: Error. unable to find spectrum name %s\n", 1293 ERR("%s: Error. unable to find spectrum name %s",
1294 progname, il->name); 1294 progname, il->name);
1295 exit(-1); 1295 exit(-1);
1296 } 1296 }
1297 spectrum_lookups = eina_list_remove(spectrum_lookups, il); 1297 spectrum_lookups = eina_list_remove(spectrum_lookups, il);
@@ -1525,8 +1525,8 @@ data_process_script_lookups(void)
1525 n = eina_convert_itoa(cl->val, buf); 1525 n = eina_convert_itoa(cl->val, buf);
1526 if (n > cl->len) 1526 if (n > cl->len)
1527 { 1527 {
1528 fprintf(stderr, "%s: Error. The unexpected happened. A numeric replacement string was larger than the original!\n", 1528 ERR("%s: Error. The unexpected happened. A numeric replacement string was larger than the original!",
1529 progname); 1529 progname);
1530 exit(-1); 1530 exit(-1);
1531 } 1531 }
1532 memset(cl->ptr, ' ', cl->len); 1532 memset(cl->ptr, ' ', cl->len);
diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index aa64dde668..e03ca76559 100644
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -114,9 +114,9 @@ new_object(void)
114 } 114 }
115 if (!handled) 115 if (!handled)
116 { 116 {
117 fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n", 117 ERR("%s: Error. %s:%i unhandled keyword %s",
118 progname, file_in, line - 1, 118 progname, file_in, line - 1,
119 (char *)eina_list_data_get(eina_list_last(stack))); 119 (char *)eina_list_data_get(eina_list_last(stack)));
120 exit(-1); 120 exit(-1);
121 } 121 }
122 free(id); 122 free(id);
@@ -144,9 +144,9 @@ new_statement(void)
144 } 144 }
145 if (!handled) 145 if (!handled)
146 { 146 {
147 fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n", 147 ERR("%s: Error. %s:%i unhandled keyword %s",
148 progname, file_in, line - 1, 148 progname, file_in, line - 1,
149 (char *)eina_list_data_get(eina_list_last(stack))); 149 (char *)eina_list_data_get(eina_list_last(stack)));
150 exit(-1); 150 exit(-1);
151 } 151 }
152 free(id); 152 free(id);
@@ -247,8 +247,8 @@ next_token(char *p, char *end, char **new_p, int *delim)
247 tmpstr = alloca(l + 1); 247 tmpstr = alloca(l + 1);
248 if (!tmpstr) 248 if (!tmpstr)
249 { 249 {
250 fprintf(stderr, "%s: Error. %s:%i malloc %i bytes failed\n", 250 ERR("%s: Error. %s:%i malloc %i bytes failed",
251 progname, file_in, line - 1, l + 1); 251 progname, file_in, line - 1, l + 1);
252 exit(-1); 252 exit(-1);
253 } 253 }
254 strncpy(tmpstr, p, l); 254 strncpy(tmpstr, p, l);
@@ -424,8 +424,8 @@ stack_chop_top(void)
424 } 424 }
425 else 425 else
426 { 426 {
427 fprintf(stderr, "%s: Error. parse error %s:%i. } marker without matching { marker\n", 427 ERR("%s: Error. parse error %s:%i. } marker without matching { marker",
428 progname, file_in, line - 1); 428 progname, file_in, line - 1);
429 exit(-1); 429 exit(-1);
430 } 430 }
431} 431}
@@ -439,8 +439,8 @@ parse(char *data, off_t size)
439 439
440 if (verbose) 440 if (verbose)
441 { 441 {
442 printf("%s: Parsing input file\n", 442 INF("%s: Parsing input file",
443 progname); 443 progname);
444 } 444 }
445 p = data; 445 p = data;
446 end = data + size; 446 end = data + size;
@@ -452,8 +452,8 @@ parse(char *data, off_t size)
452 */ 452 */
453 if (do_params && delim && *token != ';') 453 if (do_params && delim && *token != ';')
454 { 454 {
455 fprintf(stderr, "%s: Error. parse error %s:%i. %c marker before ; marker\n", 455 ERR("%s: Error. parse error %s:%i. %c marker before ; marker",
456 progname, file_in, line - 1, *token); 456 progname, file_in, line - 1, *token);
457 exit(-1); 457 exit(-1);
458 } 458 }
459 else if (delim) 459 else if (delim)
@@ -463,7 +463,7 @@ parse(char *data, off_t size)
463 { 463 {
464 if (do_params) 464 if (do_params)
465 { 465 {
466 fprintf(stderr, "%s: Error. parse error %s:%i. } marker before ; marker\n", 466 ERR("%s: Error. parse error %s:%i. } marker before ; marker",
467 progname, file_in, line - 1); 467 progname, file_in, line - 1);
468 exit(-1); 468 exit(-1);
469 } 469 }
@@ -490,8 +490,8 @@ parse(char *data, off_t size)
490 { 490 {
491 if (do_params) 491 if (do_params)
492 { 492 {
493 fprintf(stderr, "%s: Error. parse error %s:%i. { marker before ; marker\n", 493 ERR("%s: Error. parse error %s:%i. { marker before ; marker",
494 progname, file_in, line - 1); 494 progname, file_in, line - 1);
495 exit(-1); 495 exit(-1);
496 } 496 }
497 } 497 }
@@ -573,8 +573,8 @@ parse(char *data, off_t size)
573 } 573 }
574 else 574 else
575 { 575 {
576 fprintf(stderr, "%s: Error. parse error %s:%i. { marker does not have matching } marker\n", 576 ERR("%s: Error. parse error %s:%i. { marker does not have matching } marker",
577 progname, file_in, line - 1); 577 progname, file_in, line - 1);
578 exit(-1); 578 exit(-1);
579 } 579 }
580 new_object(); 580 new_object();
@@ -585,7 +585,7 @@ parse(char *data, off_t size)
585 } 585 }
586 if (verbose) 586 if (verbose)
587 { 587 {
588 printf("%s: Parsing done\n", 588 INF("%s: Parsing done",
589 progname); 589 progname);
590 } 590 }
591} 591}
@@ -766,13 +766,13 @@ compile(void)
766 fd = open(file_in, O_RDONLY | O_BINARY, S_IRUSR | S_IWUSR); 766 fd = open(file_in, O_RDONLY | O_BINARY, S_IRUSR | S_IWUSR);
767 if (fd < 0) 767 if (fd < 0)
768 { 768 {
769 fprintf(stderr, "%s: Error. cannot open file \"%s\" for input. %s\n", 769 ERR("%s: Error. cannot open file \"%s\" for input. %s",
770 progname, file_in, strerror(errno)); 770 progname, file_in, strerror(errno));
771 exit(-1); 771 exit(-1);
772 } 772 }
773 if (verbose) 773 if (verbose)
774 { 774 {
775 printf("%s: Opening \"%s\" for input\n", 775 INF("%s: Opening \"%s\" for input",
776 progname, file_in); 776 progname, file_in);
777 } 777 }
778 778
@@ -783,8 +783,8 @@ compile(void)
783 parse(data, size); 783 parse(data, size);
784 else 784 else
785 { 785 {
786 fprintf(stderr, "%s: Error. cannot read file \"%s\". %s\n", 786 ERR("%s: Error. cannot read file \"%s\". %s",
787 progname, file_in, strerror(errno)); 787 progname, file_in, strerror(errno));
788 exit(-1); 788 exit(-1);
789 } 789 }
790 free(data); 790 free(data);
@@ -811,7 +811,7 @@ is_num(int n)
811 str = eina_list_nth(params, n); 811 str = eina_list_nth(params, n);
812 if (!str) 812 if (!str)
813 { 813 {
814 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 814 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
815 progname, file_in, line - 1, n + 1); 815 progname, file_in, line - 1, n + 1);
816 exit(-1); 816 exit(-1);
817 } 817 }
@@ -831,8 +831,8 @@ parse_str(int n)
831 str = eina_list_nth(params, n); 831 str = eina_list_nth(params, n);
832 if (!str) 832 if (!str)
833 { 833 {
834 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 834 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
835 progname, file_in, line - 1, n + 1); 835 progname, file_in, line - 1, n + 1);
836 exit(-1); 836 exit(-1);
837 } 837 }
838 s = mem_strdup(str); 838 s = mem_strdup(str);
@@ -855,8 +855,8 @@ _parse_enum(char *str, va_list va)
855 /* End of the list, nothing matched. */ 855 /* End of the list, nothing matched. */
856 if (!s) 856 if (!s)
857 { 857 {
858 fprintf(stderr, "%s: Error. %s:%i token %s not one of:", 858 fprintf(stderr, "%s: Error. %s:%i token %s not one of:",
859 progname, file_in, line - 1, str); 859 progname, file_in, line - 1, str);
860 s = va_arg(va2, char *); 860 s = va_arg(va2, char *);
861 while (s) 861 while (s)
862 { 862 {
@@ -894,7 +894,7 @@ parse_enum(int n, ...)
894 str = eina_list_nth(params, n); 894 str = eina_list_nth(params, n);
895 if (!str) 895 if (!str)
896 { 896 {
897 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 897 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
898 progname, file_in, line - 1, n + 1); 898 progname, file_in, line - 1, n + 1);
899 exit(-1); 899 exit(-1);
900 } 900 }
@@ -931,8 +931,8 @@ parse_int(int n)
931 str = eina_list_nth(params, n); 931 str = eina_list_nth(params, n);
932 if (!str) 932 if (!str)
933 { 933 {
934 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 934 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
935 progname, file_in, line - 1, n + 1); 935 progname, file_in, line - 1, n + 1);
936 exit(-1); 936 exit(-1);
937 } 937 }
938 i = my_atoi(str); 938 i = my_atoi(str);
@@ -948,15 +948,15 @@ parse_int_range(int n, int f, int t)
948 str = eina_list_nth(params, n); 948 str = eina_list_nth(params, n);
949 if (!str) 949 if (!str)
950 { 950 {
951 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 951 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
952 progname, file_in, line - 1, n + 1); 952 progname, file_in, line - 1, n + 1);
953 exit(-1); 953 exit(-1);
954 } 954 }
955 i = my_atoi(str); 955 i = my_atoi(str);
956 if ((i < f) || (i > t)) 956 if ((i < f) || (i > t))
957 { 957 {
958 fprintf(stderr, "%s: Error. %s:%i integer %i out of range of %i to %i inclusive\n", 958 ERR("%s: Error. %s:%i integer %i out of range of %i to %i inclusive",
959 progname, file_in, line - 1, i, f, t); 959 progname, file_in, line - 1, i, f, t);
960 exit(-1); 960 exit(-1);
961 } 961 }
962 return i; 962 return i;
@@ -971,15 +971,15 @@ parse_bool(int n)
971 str = eina_list_nth(params, n); 971 str = eina_list_nth(params, n);
972 if (!str) 972 if (!str)
973 { 973 {
974 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 974 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
975 progname, file_in, line - 1, n + 1); 975 progname, file_in, line - 1, n + 1);
976 exit(-1); 976 exit(-1);
977 } 977 }
978 978
979 if (!strstrip(str, buf, sizeof (buf))) 979 if (!strstrip(str, buf, sizeof (buf)))
980 { 980 {
981 fprintf(stderr, "%s: Error. %s:%i expression is too long\n", 981 ERR("%s: Error. %s:%i expression is too long",
982 progname, file_in, line - 1); 982 progname, file_in, line - 1);
983 return 0; 983 return 0;
984 } 984 }
985 985
@@ -991,8 +991,8 @@ parse_bool(int n)
991 i = my_atoi(str); 991 i = my_atoi(str);
992 if ((i < 0) || (i > 1)) 992 if ((i < 0) || (i > 1))
993 { 993 {
994 fprintf(stderr, "%s: Error. %s:%i integer %i out of range of 0 to 1 inclusive\n", 994 ERR("%s: Error. %s:%i integer %i out of range of 0 to 1 inclusive",
995 progname, file_in, line - 1, i); 995 progname, file_in, line - 1, i);
996 exit(-1); 996 exit(-1);
997 } 997 }
998 return i; 998 return i;
@@ -1007,8 +1007,8 @@ parse_float(int n)
1007 str = eina_list_nth(params, n); 1007 str = eina_list_nth(params, n);
1008 if (!str) 1008 if (!str)
1009 { 1009 {
1010 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 1010 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
1011 progname, file_in, line - 1, n + 1); 1011 progname, file_in, line - 1, n + 1);
1012 exit(-1); 1012 exit(-1);
1013 } 1013 }
1014 i = my_atof(str); 1014 i = my_atof(str);
@@ -1024,15 +1024,15 @@ parse_float_range(int n, double f, double t)
1024 str = eina_list_nth(params, n); 1024 str = eina_list_nth(params, n);
1025 if (!str) 1025 if (!str)
1026 { 1026 {
1027 fprintf(stderr, "%s: Error. %s:%i no parameter supplied as argument %i\n", 1027 ERR("%s: Error. %s:%i no parameter supplied as argument %i",
1028 progname, file_in, line - 1, n + 1); 1028 progname, file_in, line - 1, n + 1);
1029 exit(-1); 1029 exit(-1);
1030 } 1030 }
1031 i = my_atof(str); 1031 i = my_atof(str);
1032 if ((i < f) || (i > t)) 1032 if ((i < f) || (i > t))
1033 { 1033 {
1034 fprintf(stderr, "%s: Error. %s:%i float %3.3f out of range of %3.3f to %3.3f inclusive\n", 1034 ERR("%s: Error. %s:%i float %3.3f out of range of %3.3f to %3.3f inclusive",
1035 progname, file_in, line - 1, i, f, t); 1035 progname, file_in, line - 1, i, f, t);
1036 exit(-1); 1036 exit(-1);
1037 } 1037 }
1038 return i; 1038 return i;
@@ -1045,8 +1045,8 @@ check_arg_count(int required_args)
1045 1045
1046 if (num_args != required_args) 1046 if (num_args != required_args)
1047 { 1047 {
1048 fprintf(stderr, "%s: Error. %s:%i got %i arguments, but expected %i\n", 1048 ERR("%s: Error. %s:%i got %i arguments, but expected %i",
1049 progname, file_in, line - 1, num_args, required_args); 1049 progname, file_in, line - 1, num_args, required_args);
1050 exit(-1); 1050 exit(-1);
1051 } 1051 }
1052} 1052}
@@ -1058,9 +1058,9 @@ check_min_arg_count(int min_required_args)
1058 1058
1059 if (num_args < min_required_args) 1059 if (num_args < min_required_args)
1060 { 1060 {
1061 fprintf(stderr, "%s: Error. %s:%i got %i arguments, " 1061 ERR("%s: Error. %s:%i got %i arguments, "
1062 "but expected at least %i\n", 1062 "but expected at least %i",
1063 progname, file_in, line - 1, num_args, min_required_args); 1063 progname, file_in, line - 1, num_args, min_required_args);
1064 exit(-1); 1064 exit(-1);
1065 } 1065 }
1066} 1066}
@@ -1086,8 +1086,8 @@ my_atoi(const char *s)
1086 if (!s) return 0; 1086 if (!s) return 0;
1087 if (!strstrip(s, buf, sizeof(buf))) 1087 if (!strstrip(s, buf, sizeof(buf)))
1088 { 1088 {
1089 fprintf(stderr, "%s: Error. %s:%i expression is too long\n", 1089 ERR("%s: Error. %s:%i expression is too long\n",
1090 progname, file_in, line - 1); 1090 progname, file_in, line - 1);
1091 return 0; 1091 return 0;
1092 } 1092 }
1093 _alphai(buf, &res); 1093 _alphai(buf, &res);
@@ -1100,8 +1100,8 @@ _deltai(char *s, int *val)
1100 if (!val) return NULL; 1100 if (!val) return NULL;
1101 if ('(' != s[0]) 1101 if ('(' != s[0])
1102 { 1102 {
1103 fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n", 1103 ERR("%s: Error. %s:%i unexpected character at %s\n",
1104 progname, file_in, line - 1, s); 1104 progname, file_in, line - 1, s);
1105 return s; 1105 return s;
1106 } 1106 }
1107 else 1107 else
@@ -1131,8 +1131,8 @@ _funci(char *s, int *val)
1131 } 1131 }
1132 else 1132 else
1133 { 1133 {
1134 fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n", 1134 ERR("%s: Error. %s:%i unexpected character at %s\n",
1135 progname, file_in, line - 1, s); 1135 progname, file_in, line - 1, s);
1136 } 1136 }
1137 return s; 1137 return s;
1138} 1138}
@@ -1154,7 +1154,7 @@ _gammai(char *s, int *val)
1154 else 1154 else
1155 { 1155 {
1156 s = _funci(s, val); 1156 s = _funci(s, val);
1157// fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n", 1157// ERR("%s: Error. %s:%i unexpected character at %s\n",
1158// progname, file_in, line - 1, s); 1158// progname, file_in, line - 1, s);
1159 } 1159 }
1160 return s; 1160 return s;
@@ -1264,8 +1264,8 @@ _calci(char op, int a, int b)
1264 case '/': 1264 case '/':
1265 if (0 != b) a /= b; 1265 if (0 != b) a /= b;
1266 else 1266 else
1267 fprintf(stderr, "%s: Error. %s:%i divide by zero\n", 1267 ERR("%s: Error. %s:%i divide by zero\n",
1268 progname, file_in, line - 1); 1268 progname, file_in, line - 1);
1269 return a; 1269 return a;
1270 case '*': 1270 case '*':
1271 a *= b; 1271 a *= b;
@@ -1273,12 +1273,12 @@ _calci(char op, int a, int b)
1273 case '%': 1273 case '%':
1274 if (0 != b) a = a % b; 1274 if (0 != b) a = a % b;
1275 else 1275 else
1276 fprintf(stderr, "%s: Error. %s:%i modula by zero\n", 1276 ERR("%s: Error. %s:%i modula by zero\n",
1277 progname, file_in, line - 1); 1277 progname, file_in, line - 1);
1278 return a; 1278 return a;
1279 default: 1279 default:
1280 fprintf(stderr, "%s: Error. %s:%i unexpected character '%c'\n", 1280 ERR("%s: Error. %s:%i unexpected character '%c'\n",
1281 progname, file_in, line - 1, op); 1281 progname, file_in, line - 1, op);
1282 return a; 1282 return a;
1283 } 1283 }
1284} 1284}
@@ -1295,8 +1295,8 @@ my_atof(const char *s)
1295 1295
1296 if (!strstrip(s, buf, sizeof (buf))) 1296 if (!strstrip(s, buf, sizeof (buf)))
1297 { 1297 {
1298 fprintf(stderr, "%s: Error. %s:%i expression is too long\n", 1298 ERR("%s: Error. %s:%i expression is too long",
1299 progname, file_in, line - 1); 1299 progname, file_in, line - 1);
1300 return 0; 1300 return 0;
1301 } 1301 }
1302 _alphaf(buf, &res); 1302 _alphaf(buf, &res);
@@ -1309,8 +1309,8 @@ _deltaf(char *s, double *val)
1309 if (!val) return NULL; 1309 if (!val) return NULL;
1310 if ('(' != s[0]) 1310 if ('(' != s[0])
1311 { 1311 {
1312 fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n", 1312 ERR("%s: Error. %s:%i unexpected character at %s",
1313 progname, file_in, line - 1, s); 1313 progname, file_in, line - 1, s);
1314 return s; 1314 return s;
1315 } 1315 }
1316 else 1316 else
@@ -1340,8 +1340,8 @@ _funcf(char *s, double *val)
1340 } 1340 }
1341 else 1341 else
1342 { 1342 {
1343 fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n", 1343 ERR("%s: Error. %s:%i unexpected character at %s\n",
1344 progname, file_in, line - 1, s); 1344 progname, file_in, line - 1, s);
1345 } 1345 }
1346 return s; 1346 return s;
1347} 1347}
@@ -1364,7 +1364,7 @@ _gammaf(char *s, double *val)
1364 else 1364 else
1365 { 1365 {
1366 s = _funcf(s, val); 1366 s = _funcf(s, val);
1367// fprintf(stderr, "%s: Error. %s:%i unexpected character at %s\n", 1367// ERR("%s: Error. %s:%i unexpected character at %s\n",
1368// progname, file_in, line - 1, s); 1368// progname, file_in, line - 1, s);
1369 } 1369 }
1370 return s; 1370 return s;
@@ -1479,8 +1479,8 @@ _calcf(char op, double a, double b)
1479 case '/': 1479 case '/':
1480 if (b != 0) a /= b; 1480 if (b != 0) a /= b;
1481 else 1481 else
1482 fprintf(stderr, "%s: Error. %s:%i divide by zero\n", 1482 ERR("%s: Error. %s:%i divide by zero\n",
1483 progname, file_in, line - 1); 1483 progname, file_in, line - 1);
1484 return a; 1484 return a;
1485 case '*': 1485 case '*':
1486 a *= b; 1486 a *= b;
@@ -1488,12 +1488,12 @@ _calcf(char op, double a, double b)
1488 case '%': 1488 case '%':
1489 if (0 != b) a = (double)((int)a % (int)b); 1489 if (0 != b) a = (double)((int)a % (int)b);
1490 else 1490 else
1491 fprintf(stderr, "%s: Error. %s:%i modula by zero\n", 1491 ERR("%s: Error. %s:%i modula by zero\n",
1492 progname, file_in, line - 1); 1492 progname, file_in, line - 1);
1493 return a; 1493 return a;
1494 default: 1494 default:
1495 fprintf(stderr, "%s: Error. %s:%i unexpected character '%c'\n", 1495 ERR("%s: Error. %s:%i unexpected character '%c'\n",
1496 progname, file_in, line - 1, op); 1496 progname, file_in, line - 1, op);
1497 return a; 1497 return a;
1498 } 1498 }
1499} 1499}
@@ -1503,7 +1503,7 @@ strstrip(const char *in, char *out, size_t size)
1503{ 1503{
1504 if ((size -1 ) < strlen(in)) 1504 if ((size -1 ) < strlen(in))
1505 { 1505 {
1506 fprintf(stderr, "%s: Error. %s:%i expression is too long\n", 1506 ERR("%s: Error. %s:%i expression is too long",
1507 progname, file_in, line - 1); 1507 progname, file_in, line - 1);
1508 return 0; 1508 return 0;
1509 } 1509 }
diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c
index e060a9800e..ba88bc9e68 100644
--- a/legacy/edje/src/bin/edje_cc_sources.c
+++ b/legacy/edje/src/bin/edje_cc_sources.c
@@ -70,8 +70,8 @@ source_fetch_file(const char *fil, const char *filname)
70 f = fopen(fil, "rb"); 70 f = fopen(fil, "rb");
71 if (!f) 71 if (!f)
72 { 72 {
73 fprintf(stderr, "%s: Warning. Cannot open file '%s'\n", 73 ERR("%s: Warning. Cannot open file '%s'",
74 progname, fil); 74 progname, fil);
75 exit(-1); 75 exit(-1);
76 } 76 }
77 77
@@ -86,7 +86,7 @@ source_fetch_file(const char *fil, const char *filname)
86 tmp = fread(sf->file, sz, 1, f); 86 tmp = fread(sf->file, sz, 1, f);
87 if (tmp != 1) 87 if (tmp != 1)
88 { 88 {
89 fprintf(stderr, "%s: Warning file length for (%s) doesn't match !\n", 89 ERR("%s: Warning file length for (%s) doesn't match !",
90 progname, filname); 90 progname, filname);
91 exit(-1); 91 exit(-1);
92 } 92 }
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index e1402adcae..0189ab8718 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -21,6 +21,7 @@
21 21
22#include "edje_decc.h" 22#include "edje_decc.h"
23 23
24int _edje_cc_log_dom = -1;
24char *progname = NULL; 25char *progname = NULL;
25char *file_in = NULL; 26char *file_in = NULL;
26char *file_out = NULL; 27char *file_out = NULL;
@@ -57,7 +58,15 @@ main(int argc, char **argv)
57 int i; 58 int i;
58 59
59 setlocale(LC_NUMERIC, "C"); 60 setlocale(LC_NUMERIC, "C");
60 61 eina_init();
62 _edje_cc_log_dom = eina_log_domain_register("edje_decc", EDJE_CC_DEFAULT_LOG_COLOR);
63 if(_edje_cc_log_dom < 0)
64 {
65 EINA_LOG_ERR("Edje_decc: Impossible to create a log domain for edje_decc");
66 eina_shutdown();
67 exit(-1);
68 }
69 eina_log_level_set(EINA_LOG_LEVEL_INFO);
61 progname = argv[0]; 70 progname = argv[0];
62 for (i = 1; i < argc; i++) 71 for (i = 1; i < argc; i++)
63 { 72 {
@@ -75,7 +84,7 @@ main(int argc, char **argv)
75 } 84 }
76 if (!file_in) 85 if (!file_in)
77 { 86 {
78 fprintf(stderr, "%s: Error: no input file specified.\n", progname); 87 ERR("%s: Error: no input file specified.", progname);
79 main_help(); 88 main_help();
80 exit(-1); 89 exit(-1);
81 } 90 }
@@ -89,6 +98,9 @@ main(int argc, char **argv)
89 98
90 eet_close(ef); 99 eet_close(ef);
91 eet_shutdown(); 100 eet_shutdown();
101 eina_log_domain_unregister(_edje_cc_log_dom);
102 _edje_cc_log_dom = -1;
103 eina_shutdown();
92 return 0; 104 return 0;
93} 105}
94 106
@@ -98,27 +110,27 @@ decomp(void)
98 ef = eet_open(file_in, EET_FILE_MODE_READ); 110 ef = eet_open(file_in, EET_FILE_MODE_READ);
99 if (!ef) 111 if (!ef)
100 { 112 {
101 printf("ERROR: cannot open %s\n", file_in); 113 ERR("ERROR: cannot open %s", file_in);
102 return 0; 114 return 0;
103 } 115 }
104 116
105 srcfiles = source_load(ef); 117 srcfiles = source_load(ef);
106 if (!srcfiles || !srcfiles->list) 118 if (!srcfiles || !srcfiles->list)
107 { 119 {
108 printf("ERROR: %s has no decompile information\n", file_in); 120 ERR("ERROR: %s has no decompile information", file_in);
109 eet_close(ef); 121 eet_close(ef);
110 return 0; 122 return 0;
111 } 123 }
112 if (!eina_list_data_get(srcfiles->list) || !root_filename_is_sane()) 124 if (!eina_list_data_get(srcfiles->list) || !root_filename_is_sane())
113 { 125 {
114 printf("ERROR: Invalid root filename: '%s'\n", (char *) eina_list_data_get(srcfiles->list)); 126 ERR("ERROR: Invalid root filename: '%s'", (char *) eina_list_data_get(srcfiles->list));
115 eet_close(ef); 127 eet_close(ef);
116 return 0; 128 return 0;
117 } 129 }
118 edje_file = eet_data_read(ef, _edje_edd_edje_file, "edje_file"); 130 edje_file = eet_data_read(ef, _edje_edd_edje_file, "edje_file");
119 if (!edje_file) 131 if (!edje_file)
120 { 132 {
121 printf("ERROR: %s does not appear to be an edje file\n", file_in); 133 ERR("ERROR: %s does not appear to be an edje file", file_in);
122 eet_close(ef); 134 eet_close(ef);
123 return 0; 135 return 0;
124 } 136 }
@@ -128,7 +140,7 @@ decomp(void)
128 } 140 }
129 else if (!compiler_cmd_is_sane()) 141 else if (!compiler_cmd_is_sane())
130 { 142 {
131 printf("ERROR: invalid compiler executable: '%s'\n", edje_file->compiler); 143 ERR("ERROR: invalid compiler executable: '%s'", edje_file->compiler);
132 eet_close(ef); 144 eet_close(ef);
133 return 0; 145 return 0;
134 } 146 }
@@ -184,14 +196,14 @@ output(void)
184 ee = ecore_evas_buffer_new(1, 1); 196 ee = ecore_evas_buffer_new(1, 1);
185 if (!ee) 197 if (!ee)
186 { 198 {
187 fprintf(stderr, "Error. cannot create buffer engine canvas for image save.\n"); 199 ERR("Cannot create buffer engine canvas for image save.");
188 exit(-1); 200 exit(-1);
189 } 201 }
190 evas = ecore_evas_get(ee); 202 evas = ecore_evas_get(ee);
191 im = evas_object_image_add(evas); 203 im = evas_object_image_add(evas);
192 if (!im) 204 if (!im)
193 { 205 {
194 fprintf(stderr, "Error. cannot create image object for save.\n"); 206 ERR("Cannot create image object for save.");
195 exit(-1); 207 exit(-1);
196 } 208 }
197 snprintf(buf, sizeof(buf), "images/%i", ei->id); 209 snprintf(buf, sizeof(buf), "images/%i", ei->id);
@@ -203,14 +215,14 @@ output(void)
203 *p = 0; 215 *p = 0;
204 if (strstr(pp, "../")) 216 if (strstr(pp, "../"))
205 { 217 {
206 printf("ERROR: potential security violation. attempt to write in parent dir.\n"); 218 ERR("Potential security violation. attempt to write in parent dir.");
207 exit(-1); 219 exit(-1);
208 } 220 }
209 ecore_file_mkpath(pp); 221 ecore_file_mkpath(pp);
210 free(pp); 222 free(pp);
211 if (!evas_object_image_save(im, out, NULL, "quality=100 compress=9")) 223 if (!evas_object_image_save(im, out, NULL, "quality=100 compress=9"))
212 { 224 {
213 printf("ERROR: cannot write file %s. Perhaps missing JPEG or PNG saver modules for Evas.\n", out); 225 ERR("Cannot write file %s. Perhaps missing JPEG or PNG saver modules for Evas.", out);
214 exit(-1); 226 exit(-1);
215 } 227 }
216 evas_object_del(im); 228 evas_object_del(im);
@@ -228,26 +240,26 @@ output(void)
228 char *pp; 240 char *pp;
229 241
230 snprintf(out, sizeof(out), "%s/%s", outdir, sf->name); 242 snprintf(out, sizeof(out), "%s/%s", outdir, sf->name);
231 printf("Output Source File: %s\n", out); 243 INF("Output Source File: %s\n", out);
232 pp = strdup(out); 244 pp = strdup(out);
233 p = strrchr(pp, '/'); 245 p = strrchr(pp, '/');
234 *p = 0; 246 *p = 0;
235 if (strstr(pp, "../")) 247 if (strstr(pp, "../"))
236 { 248 {
237 printf("ERROR: potential security violation. attempt to write in parent dir.\n"); 249 ERR("Potential security violation. attempt to write in parent dir.");
238 exit (-1); 250 exit (-1);
239 } 251 }
240 ecore_file_mkpath(pp); 252 ecore_file_mkpath(pp);
241 free(pp); 253 free(pp);
242 if (strstr(out, "../")) 254 if (strstr(out, "../"))
243 { 255 {
244 printf("ERROR: potential security violation. attempt to write in parent dir.\n"); 256 ERR("Potential security violation. attempt to write in parent dir.");
245 exit (-1); 257 exit (-1);
246 } 258 }
247 f = fopen(out, "wb"); 259 f = fopen(out, "wb");
248 if (!f) 260 if (!f)
249 { 261 {
250 printf("ERROR: unable to write file (%s).\n", out); 262 ERR("Unable to write file (%s).", out);
251 exit (-1); 263 exit (-1);
252 } 264 }
253 265
@@ -275,20 +287,20 @@ output(void)
275 char *pp; 287 char *pp;
276 288
277 snprintf(out, sizeof(out), "%s/%s", outdir, fn->file); 289 snprintf(out, sizeof(out), "%s/%s", outdir, fn->file);
278 printf("Output Font: %s\n", out); 290 INF("Output Font: %s", out);
279 pp = strdup(out); 291 pp = strdup(out);
280 p = strrchr(pp, '/'); 292 p = strrchr(pp, '/');
281 *p = 0; 293 *p = 0;
282 if (strstr(pp, "../")) 294 if (strstr(pp, "../"))
283 { 295 {
284 printf("ERROR: potential security violation. attempt to write in parent dir.\n"); 296 ERR("Potential security violation. attempt to write in parent dir.");
285 exit (-1); 297 exit (-1);
286 } 298 }
287 ecore_file_mkpath(pp); 299 ecore_file_mkpath(pp);
288 free(pp); 300 free(pp);
289 if (strstr(out, "../")) 301 if (strstr(out, "../"))
290 { 302 {
291 printf("ERROR: potential security violation. attempt to write in parent dir.\n"); 303 ERR("Potential security violation. attempt to write in parent dir.");
292 exit (-1); 304 exit (-1);
293 } 305 }
294 f = fopen(out, "wb"); 306 f = fopen(out, "wb");
@@ -310,7 +322,7 @@ output(void)
310 printf("Output Build Script: %s\n", out); 322 printf("Output Build Script: %s\n", out);
311 if (strstr(out, "../")) 323 if (strstr(out, "../"))
312 { 324 {
313 printf("ERROR: potential security violation. attempt to write in parent dir.\n"); 325 ERR("potential security violation. attempt to write in parent dir.\n");
314 exit (-1); 326 exit (-1);
315 } 327 }
316 f = fopen(out, "wb"); 328 f = fopen(out, "wb");
@@ -318,9 +330,9 @@ output(void)
318 fprintf(f, "%s $@ -id . -fd . %s -o %s.edj\n", edje_file->compiler, sf->name, outdir); 330 fprintf(f, "%s $@ -id . -fd . %s -o %s.edj\n", edje_file->compiler, sf->name, outdir);
319 fclose(f); 331 fclose(f);
320 332
321 printf("\n*** CAUTION ***\n" 333 WRN("\n*** CAUTION ***\n"
322 "Please check the build script for anything malicious " 334 "Please check the build script for anything malicious "
323 "before running it!\n\n"); 335 "before running it!\n\n");
324 } 336 }
325 337
326 if (file_out) 338 if (file_out)
@@ -328,7 +340,7 @@ output(void)
328 snprintf(out, sizeof(out), "%s/%s", outdir, file_out); 340 snprintf(out, sizeof(out), "%s/%s", outdir, file_out);
329 if (symlink(sf->name, out) != 0) 341 if (symlink(sf->name, out) != 0)
330 { 342 {
331 printf("ERROR: symlink %s -> %s failed\n", sf->name, out); 343 ERR("symlink %s -> %s failed\n", sf->name, out);
332 } 344 }
333 } 345 }
334 346
diff --git a/legacy/edje/src/bin/edje_decc.h b/legacy/edje/src/bin/edje_decc.h
index be0495ce87..43e988d70d 100644
--- a/legacy/edje/src/bin/edje_decc.h
+++ b/legacy/edje/src/bin/edje_decc.h
@@ -3,6 +3,22 @@
3 3
4#include <edje_private.h> 4#include <edje_private.h>
5 5
6/* logging variables */
7extern int _edje_cc_log_dom ;
8#define EDJE_CC_DEFAULT_LOG_COLOR EINA_COLOR_CYAN
9#ifdef ERR
10# undef ERR
11#endif
12#define ERR(...) EINA_LOG_DOM_ERR(_edje_cc_log_dom, __VA_ARGS__)
13#ifdef INF
14# undef INF
15#endif
16#define INF(...) EINA_LOG_DOM_INFO(_edje_cc_log_dom, __VA_ARGS__)
17#ifdef WRN
18# undef WRN
19#endif
20#define WRN(...) EINA_LOG_DOM_WARN(_edje_cc_log_dom, __VA_ARGS__)
21
6/* types */ 22/* types */
7typedef struct _Font Font; 23typedef struct _Font Font;
8typedef struct _Font_List Font_List; 24typedef struct _Font_List Font_List;
diff --git a/legacy/edje/src/bin/edje_prefix.c b/legacy/edje/src/bin/edje_prefix.c
index 9a8fb21c9f..0819ee1ad3 100644
--- a/legacy/edje/src/bin/edje_prefix.c
+++ b/legacy/edje/src/bin/edje_prefix.c
@@ -26,7 +26,7 @@
26#endif 26#endif
27 27
28#include "edje_prefix.h" 28#include "edje_prefix.h"
29 29#include "edje_cc.h"
30#ifdef _WIN32 30#ifdef _WIN32
31# define EDJE_DIR_SEPARATOR '\\' 31# define EDJE_DIR_SEPARATOR '\\'
32# define EDJE_DIR_SEPARATOR_S "\\" 32# define EDJE_DIR_SEPARATOR_S "\\"
@@ -301,7 +301,7 @@ _e_prefix_fallbacks(void)
301 _prefix_path_bin = strdup(PACKAGE_BIN_DIR); 301 _prefix_path_bin = strdup(PACKAGE_BIN_DIR);
302 _prefix_path_data = strdup(PACKAGE_DATA_DIR); 302 _prefix_path_data = strdup(PACKAGE_DATA_DIR);
303 _prefix_path_lib = strdup(PACKAGE_LIB_DIR); 303 _prefix_path_lib = strdup(PACKAGE_LIB_DIR);
304 printf("WARNING: Edje could not determine its installed prefix\n" 304 WRN("WARNING: Edje could not determine its installed prefix\n"
305 " and is falling back on the compiled in default:\n" 305 " and is falling back on the compiled in default:\n"
306 " %s\n" 306 " %s\n"
307 " You might like to try setting the following environment variables:\n" 307 " You might like to try setting the following environment variables:\n"
@@ -311,9 +311,8 @@ _e_prefix_fallbacks(void)
311 " EDJE_LIB_DIR - optional in addition to E_PREFIX to provide\n" 311 " EDJE_LIB_DIR - optional in addition to E_PREFIX to provide\n"
312 " a more specific library dir\n" 312 " a more specific library dir\n"
313 " EDJE_DATA_DIR- optional in addition to E_PREFIX to provide\n" 313 " EDJE_DATA_DIR- optional in addition to E_PREFIX to provide\n"
314 " a more specific location for shared data\n" 314 " a more specific location for shared data",
315 , 315 _prefix_path);
316 _prefix_path);
317 return 1; 316 return 1;
318} 317}
319 318
diff --git a/legacy/edje/src/lib/edje_cache.c b/legacy/edje/src/lib/edje_cache.c
index f235465c13..acc9551085 100644
--- a/legacy/edje/src/lib/edje_cache.c
+++ b/legacy/edje/src/lib/edje_cache.c
@@ -105,12 +105,12 @@ _edje_file_coll_open(Edje_File *edf, const char *coll)
105 if ((err_code = luaL_loadbuffer(edc->L, data, size, "edje_lua_script"))) 105 if ((err_code = luaL_loadbuffer(edc->L, data, size, "edje_lua_script")))
106 { 106 {
107 if (err_code == LUA_ERRSYNTAX) 107 if (err_code == LUA_ERRSYNTAX)
108 printf("lua load syntax error: %s\n", lua_tostring(edc->L, -1)); 108 ERR("lua load syntax error: %s", lua_tostring(edc->L, -1));
109 else if (err_code == LUA_ERRMEM) 109 else if (err_code == LUA_ERRMEM)
110 printf("lua load memory allocation error: %s\n", lua_tostring(edc->L, -1)); 110 ERR("lua load memory allocation error: %s", lua_tostring(edc->L, -1));
111 } 111 }
112 if (lua_pcall(edc->L, 0, 0, 0)) 112 if (lua_pcall(edc->L, 0, 0, 0))
113 printf("lua call error: %s\n", lua_tostring(edc->L, -1)); 113 ERR("lua call error: %s", lua_tostring(edc->L, -1));
114 free(data); 114 free(data);
115 } 115 }
116 116
@@ -315,7 +315,7 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
315 ep2 = eina_list_nth(edc->parts, ep2->dragable.confine_id); 315 ep2 = eina_list_nth(edc->parts, ep2->dragable.confine_id);
316 if (eina_list_data_find(hist, ep2)) 316 if (eina_list_data_find(hist, ep2))
317 { 317 {
318 printf("EDJE ERROR: confine_to loops. invalidating loop.\n"); 318 ERR("confine_to loops. invalidating loop.");
319 ep2->dragable.confine_id = -1; 319 ep2->dragable.confine_id = -1;
320 break; 320 break;
321 } 321 }
@@ -340,7 +340,7 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
340 340
341 if (eina_list_data_find(hist, ep2)) 341 if (eina_list_data_find(hist, ep2))
342 { 342 {
343 printf("EDJE ERROR: events_to loops. invalidating loop.\n"); 343 ERR("events_to loops. invalidating loop.");
344 ep2->dragable.events_id = -1; 344 ep2->dragable.events_id = -1;
345 break; 345 break;
346 } 346 }
@@ -355,7 +355,7 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
355 ep2 = eina_list_nth(edc->parts, ep2->clip_to_id); 355 ep2 = eina_list_nth(edc->parts, ep2->clip_to_id);
356 if (eina_list_data_find(hist, ep2)) 356 if (eina_list_data_find(hist, ep2))
357 { 357 {
358 printf("EDJE ERROR: clip_to loops. invalidating loop.\n"); 358 ERR("clip_to loops. invalidating loop.");
359 ep2->clip_to_id = -1; 359 ep2->clip_to_id = -1;
360 break; 360 break;
361 } 361 }
diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 565271dcf9..0ce433ccf4 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -1452,8 +1452,8 @@ _edje_box_recalc_apply(Edje *ed __UNUSED__, Edje_Real_Part *ep, Edje_Calc_Params
1452 if ((!chosen_desc->box.alt_layout) || 1452 if ((!chosen_desc->box.alt_layout) ||
1453 (!_edje_box_layout_find(chosen_desc->box.alt_layout, &layout, &data, &free_data))) 1453 (!_edje_box_layout_find(chosen_desc->box.alt_layout, &layout, &data, &free_data)))
1454 { 1454 {
1455 fprintf(stderr, "ERROR: box layout '%s' (fallback '%s') not available, using horizontal.\n", 1455 ERR("ERROR: box layout '%s' (fallback '%s') not available, using horizontal.",
1456 chosen_desc->box.layout, chosen_desc->box.alt_layout); 1456 chosen_desc->box.layout, chosen_desc->box.alt_layout);
1457 layout = evas_object_box_layout_horizontal; 1457 layout = evas_object_box_layout_horizontal;
1458 free_data = NULL; 1458 free_data = NULL;
1459 data = NULL; 1459 data = NULL;
@@ -1547,11 +1547,11 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
1547 } 1547 }
1548 if (image_id < 0) 1548 if (image_id < 0)
1549 { 1549 {
1550 printf("EDJE ERROR: part \"%s\" has description, " 1550 ERR("┬ĘPart \"%s\" has description, "
1551 "\"%s\" %3.3f with a missing image id!!!\n", 1551 "\"%s\" %3.3f with a missing image id!!!",
1552 ep->part->name, 1552 ep->part->name,
1553 ep->param1.description->state.name, 1553 ep->param1.description->state.name,
1554 ep->param1.description->state.value); 1554 ep->param1.description->state.value);
1555 } 1555 }
1556 else 1556 else
1557 { 1557 {
@@ -1565,28 +1565,28 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
1565 evas_object_image_file_set(ep->object, ed->file->path, buf); 1565 evas_object_image_file_set(ep->object, ed->file->path, buf);
1566 if (evas_object_image_load_error_get(ep->object) != EVAS_LOAD_ERROR_NONE) 1566 if (evas_object_image_load_error_get(ep->object) != EVAS_LOAD_ERROR_NONE)
1567 { 1567 {
1568 printf("EDJE: Error loading image collection \"%s\" from " 1568 ERR("Error loading image collection \"%s\" from "
1569 "file \"%s\". Missing EET Evas loader module?\n", 1569 "file \"%s\". Missing EET Evas loader module?",
1570 buf, ed->file->path); 1570 buf, ed->file->path);
1571 switch (evas_object_image_load_error_get(ep->object)) 1571 switch (evas_object_image_load_error_get(ep->object))
1572 { 1572 {
1573 case EVAS_LOAD_ERROR_GENERIC: 1573 case EVAS_LOAD_ERROR_GENERIC:
1574 printf("Error type: EVAS_LOAD_ERROR_GENERIC\n"); 1574 ERR("Error type: EVAS_LOAD_ERROR_GENERIC");
1575 break; 1575 break;
1576 case EVAS_LOAD_ERROR_DOES_NOT_EXIST: 1576 case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
1577 printf("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST\n"); 1577 ERR("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST");
1578 break; 1578 break;
1579 case EVAS_LOAD_ERROR_PERMISSION_DENIED: 1579 case EVAS_LOAD_ERROR_PERMISSION_DENIED:
1580 printf("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED\n"); 1580 ERR("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED");
1581 break; 1581 break;
1582 case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: 1582 case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
1583 printf("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED\n"); 1583 ERR("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED");
1584 break; 1584 break;
1585 case EVAS_LOAD_ERROR_CORRUPT_FILE: 1585 case EVAS_LOAD_ERROR_CORRUPT_FILE:
1586 printf("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE\n"); 1586 ERR("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE");
1587 break; 1587 break;
1588 case EVAS_LOAD_ERROR_UNKNOWN_FORMAT: 1588 case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
1589 printf("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT\n"); 1589 ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
1590 break; 1590 break;
1591 } 1591 }
1592 } 1592 }
@@ -1635,12 +1635,12 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags)
1635 faxes = "X"; 1635 faxes = "X";
1636 else if ((flags & FLAG_Y)) 1636 else if ((flags & FLAG_Y))
1637 faxes = "Y"; 1637 faxes = "Y";
1638 printf("EDJE ERROR: Circular dependency when calculating part \"%s\"\n" 1638 ERR("Circular dependency when calculating part \"%s\"\n"
1639 " Already calculating %s [%02x] axes\n" 1639 "Already calculating %s [%02x] axes\n"
1640 " Need to calculate %s [%02x] axes\n", 1640 "Need to calculate %s [%02x] axes",
1641 ep->part->name, 1641 ep->part->name,
1642 axes, ep->calculating, 1642 axes, ep->calculating,
1643 faxes, flags); 1643 faxes, flags);
1644#endif 1644#endif
1645 return; 1645 return;
1646 } 1646 }
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index abb801ec23..650b496127 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -72,8 +72,8 @@ _alloc(size_t size)
72 72
73 mem = calloc(1, size); 73 mem = calloc(1, size);
74 if (mem) return mem; 74 if (mem) return mem;
75 fprintf(stderr, "Edje_Edit: Error. memory allocation of %i bytes failed. %s\n", 75 ERR("Edje_Edit: Error. memory allocation of %i bytes failed. %s",
76 (int)size, strerror(errno)); 76 (int)size, strerror(errno));
77 return NULL; 77 return NULL;
78} 78}
79 79
@@ -228,10 +228,10 @@ _edje_import_image_file(Edje *ed, const char *path, int id)
228 evas_object_image_file_set(im, path, NULL); 228 evas_object_image_file_set(im, path, NULL);
229 if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE) 229 if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
230 { 230 {
231 fprintf(stderr, "Edje_Edit: Error. unable to load image \"%s\"." 231 ERR("Edje_Edit: unable to load image \"%s\"."
232 "Missing PNG or JPEG loader modules for Evas or " 232 "Missing PNG or JPEG loader modules for Evas or "
233 "file does not exist, or is not readable.\n", path); 233 "file does not exist, or is not readable.", path);
234 evas_object_del(im); 234 evas_object_del(im);
235 im = NULL; 235 im = NULL;
236 return 0; 236 return 0;
237 } 237 }
@@ -253,8 +253,7 @@ _edje_import_image_file(Edje *ed, const char *path, int id)
253 eetf = eet_open(ed->path, EET_FILE_MODE_READ_WRITE); 253 eetf = eet_open(ed->path, EET_FILE_MODE_READ_WRITE);
254 if (!eetf) 254 if (!eetf)
255 { 255 {
256 fprintf(stderr, 256 ERR("Edje_Edit: Error. unable to open \"%s\" for writing output",
257 "Edje_Edit: Error. unable to open \"%s\" for writing output\n",
258 ed->path); 257 ed->path);
259 evas_object_del(im); 258 evas_object_del(im);
260 return 0; 259 return 0;
@@ -270,8 +269,8 @@ _edje_import_image_file(Edje *ed, const char *path, int id)
270 0, 100, 1); 269 0, 100, 1);
271 if (bytes <= 0) 270 if (bytes <= 0)
272 { 271 {
273 fprintf(stderr, "Edje_Edit: Error. unable to write image part \"%s\" " 272 ERR("Edje_Edit: Error. unable to write image part \"%s\" "
274 "part entry to %s\n", buf, ed->path); 273 "part entry to %s", buf, ed->path);
275 evas_object_del(im); 274 evas_object_del(im);
276 return 0; 275 return 0;
277 } 276 }
@@ -283,8 +282,8 @@ _edje_import_image_file(Edje *ed, const char *path, int id)
283 bytes = eet_data_write(eetf, _edje_edd_edje_file, "edje_file", ed->file, 1); 282 bytes = eet_data_write(eetf, _edje_edd_edje_file, "edje_file", ed->file, 1);
284 if (bytes <= 0) 283 if (bytes <= 0)
285 { 284 {
286 fprintf(stderr, "Edje_Edit: Error. unable to write \"edje_file\" " 285 ERR("Edje_Edit: Error. unable to write \"edje_file\" "
287 "entry to \"%s\" \n", ed->path); 286 "entry to \"%s\"", ed->path);
288 eet_close(eetf); 287 eet_close(eetf);
289 return 0; 288 return 0;
290 } 289 }
@@ -780,8 +779,8 @@ edje_edit_group_del(Evas_Object *obj)
780 eetf = eet_open(ed->file->path, EET_FILE_MODE_READ_WRITE); 779 eetf = eet_open(ed->file->path, EET_FILE_MODE_READ_WRITE);
781 if (!eetf) 780 if (!eetf)
782 { 781 {
783 fprintf(stderr, "Edje_Edit: Error. unable to open \"%s\" " 782 ERR("Edje_Edit: Error. unable to open \"%s\" "
784 "for writing output\n", ed->file->path); 783 "for writing output", ed->file->path);
785 return 0; 784 return 0;
786 } 785 }
787 snprintf(buf, sizeof(buf), "collections/%d", g->id); 786 snprintf(buf, sizeof(buf), "collections/%d", g->id);
@@ -3822,8 +3821,8 @@ edje_edit_font_add(Evas_Object *obj, const char* path)
3822 { 3821 {
3823 if (fread(fdata, pos, 1, f) != 1) 3822 if (fread(fdata, pos, 1, f) != 1)
3824 { 3823 {
3825 fprintf(stderr, "Edje_Edit: Error. unable to read all of font file \"%s\"\n", 3824 ERR("Edje_Edit: Error. unable to read all of font file \"%s\"",
3826 path); 3825 path);
3827 return 0; 3826 return 0;
3828 } 3827 }
3829 fsize = pos; 3828 fsize = pos;
@@ -3839,16 +3838,15 @@ edje_edit_font_add(Evas_Object *obj, const char* path)
3839 eetf = eet_open(ed->path, EET_FILE_MODE_READ_WRITE); 3838 eetf = eet_open(ed->path, EET_FILE_MODE_READ_WRITE);
3840 if (!eetf) 3839 if (!eetf)
3841 { 3840 {
3842 fprintf(stderr, 3841 ERR("Edje_Edit: Error. unable to open \"%s\" for writing output",
3843 "Edje_Edit: Error. unable to open \"%s\" for writing output\n", 3842 ed->path);
3844 ed->path);
3845 return 0; 3843 return 0;
3846 } 3844 }
3847 3845
3848 if (eet_write(eetf, buf, fdata, fsize, 1) <= 0) 3846 if (eet_write(eetf, buf, fdata, fsize, 1) <= 0)
3849 { 3847 {
3850 fprintf(stderr, "Edje_Edit: Error. unable to write font part \"%s\" as \"%s\" part entry\n", 3848 ERR("Edje_Edit: Error. unable to write font part \"%s\" as \"%s\" part entry",
3851 path, buf); 3849 path, buf);
3852 eet_close(eetf); 3850 eet_close(eetf);
3853 free(fdata); 3851 free(fdata);
3854 return 0; 3852 return 0;
@@ -5941,7 +5939,7 @@ _edje_generate_source(Evas_Object *obj)
5941 strcpy(tmpn, "/tmp/edje_edit.edc-tmp-XXXXXX"); 5939 strcpy(tmpn, "/tmp/edje_edit.edc-tmp-XXXXXX");
5942#endif 5940#endif
5943 if (!(fd = mkstemp(tmpn))) return NULL; 5941 if (!(fd = mkstemp(tmpn))) return NULL;
5944 printf("*** tmp file: %s\n", tmpn); 5942 INF("*** tmp file: %s", tmpn);
5945 if (!(f = fdopen(fd, "wb"))) return NULL; 5943 if (!(f = fdopen(fd, "wb"))) return NULL;
5946 5944
5947 /* Write edc into file */ 5945 /* Write edc into file */
@@ -6109,8 +6107,8 @@ edje_edit_save(Evas_Object *obj)
6109 ef = ed->file; 6107 ef = ed->file;
6110 if (!ef) return 0; 6108 if (!ef) return 0;
6111 6109
6112 printf("*********** Saving file ******************\n"); 6110 INF("*********** Saving file ******************");
6113 printf("** path: %s\n", ef->path); 6111 INF("** path: %s", ef->path);
6114 6112
6115 /* Set compiler name */ 6113 /* Set compiler name */
6116 if (strcmp(ef->compiler, "edje_edit")) 6114 if (strcmp(ef->compiler, "edje_edit"))
@@ -6123,18 +6121,18 @@ edje_edit_save(Evas_Object *obj)
6123 eetf = eet_open(ef->path, EET_FILE_MODE_READ_WRITE); 6121 eetf = eet_open(ef->path, EET_FILE_MODE_READ_WRITE);
6124 if (!eetf) 6122 if (!eetf)
6125 { 6123 {
6126 fprintf(stderr, "Error. unable to open \"%s\" for writing output\n", 6124 ERR("Error. unable to open \"%s\" for writing output",
6127 ef->path); 6125 ef->path);
6128 return 0; 6126 return 0;
6129 } 6127 }
6130 6128
6131 /* Write Edje_File structure */ 6129 /* Write Edje_File structure */
6132 printf("** Writing Edje_File* ed->file\n"); 6130 INF("** Writing Edje_File* ed->file");
6133 bytes = eet_data_write(eetf, _edje_edd_edje_file, "edje_file", ef, 1); 6131 bytes = eet_data_write(eetf, _edje_edd_edje_file, "edje_file", ef, 1);
6134 if (bytes <= 0) 6132 if (bytes <= 0)
6135 { 6133 {
6136 fprintf(stderr, "Error. unable to write \"edje_file\" " 6134 ERR("Error. unable to write \"edje_file\" "
6137 "entry to \"%s\" \n", ef->path); 6135 "entry to \"%s\"", ef->path);
6138 eet_close(eetf); 6136 eet_close(eetf);
6139 return 0; 6137 return 0;
6140 } 6138 }
@@ -6142,8 +6140,8 @@ edje_edit_save(Evas_Object *obj)
6142 /* Write all the collections */ 6140 /* Write all the collections */
6143 if (ed->collection) 6141 if (ed->collection)
6144 { 6142 {
6145 printf("** Writing Edje_Part_Collection* ed->collection " 6143 INF("** Writing Edje_Part_Collection* ed->collection "
6146 "[id: %d]\n", ed->collection->id); 6144 "[id: %d]", ed->collection->id);
6147 6145
6148 snprintf(buf, sizeof(buf), "collections/%i", ed->collection->id); 6146 snprintf(buf, sizeof(buf), "collections/%i", ed->collection->id);
6149 6147
@@ -6151,8 +6149,8 @@ edje_edit_save(Evas_Object *obj)
6151 buf, ed->collection, 1); 6149 buf, ed->collection, 1);
6152 if (bytes <= 0) 6150 if (bytes <= 0)
6153 { 6151 {
6154 fprintf(stderr, "Error. unable to write \"%s\" part entry to %s \n", 6152 ERR("Error. unable to write \"%s\" part entry to %s",
6155 buf, ef->path); 6153 buf, ef->path);
6156 eet_close(eetf); 6154 eet_close(eetf);
6157 return 0; 6155 return 0;
6158 } 6156 }
@@ -6168,11 +6166,11 @@ edje_edit_save(Evas_Object *obj)
6168 source_file = _edje_generate_source(obj); 6166 source_file = _edje_generate_source(obj);
6169 if (!source_file) 6167 if (!source_file)
6170 { 6168 {
6171 fprintf(stderr, "Error: can't create edc source\n"); 6169 ERR("Error: can't create edc source");
6172 eet_close(eetf); 6170 eet_close(eetf);
6173 return 0; 6171 return 0;
6174 } 6172 }
6175 printf("** Writing EDC Source [from: %s]\n", source_file); 6173 INF("** Writing EDC Source [from: %s]", source_file);
6176 6174
6177 //open the temp file and put the contents in SrcFile 6175 //open the temp file and put the contents in SrcFile
6178 sf = _alloc(sizeof(SrcFile)); 6176 sf = _alloc(sizeof(SrcFile));
@@ -6182,8 +6180,8 @@ edje_edit_save(Evas_Object *obj)
6182 f = fopen(source_file, "rb"); 6180 f = fopen(source_file, "rb");
6183 if (!f) 6181 if (!f)
6184 { 6182 {
6185 fprintf(stderr, "Error. unable to read the created edc source [%s]\n", 6183 ERR("Error. unable to read the created edc source [%s]",
6186 source_file); 6184 source_file);
6187 eet_close(eetf); 6185 eet_close(eetf);
6188 return 0; 6186 return 0;
6189 } 6187 }
@@ -6211,7 +6209,7 @@ edje_edit_save(Evas_Object *obj)
6211 bytes = eet_data_write(eetf, _srcfile_list_edd, "edje_sources", sfl, 1); 6209 bytes = eet_data_write(eetf, _srcfile_list_edd, "edje_sources", sfl, 1);
6212 if (bytes <= 0) 6210 if (bytes <= 0)
6213 { 6211 {
6214 fprintf(stderr, "Error. unable to write edc source\n"); 6212 ERR("Error. unable to write edc source");
6215 eet_close(eetf); 6213 eet_close(eetf);
6216 return 0; 6214 return 0;
6217 } 6215 }
@@ -6220,7 +6218,7 @@ edje_edit_save(Evas_Object *obj)
6220 unlink(source_file); 6218 unlink(source_file);
6221 eina_stringshare_del(source_file); 6219 eina_stringshare_del(source_file);
6222 eet_close(eetf); 6220 eet_close(eetf);
6223 printf("*********** Saving DONE ******************\n"); 6221 INF("*********** Saving DONE ******************");
6224 return 1; 6222 return 1;
6225} 6223}
6226 6224
@@ -6236,15 +6234,15 @@ edje_edit_print_internal_status(Evas_Object *obj)
6236 _edje_generate_source(obj); 6234 _edje_generate_source(obj);
6237 return; 6235 return;
6238 6236
6239 printf("\n****** CHECKIN' INTERNAL STRUCTS STATUS *********\n"); 6237 INF("\n****** CHECKIN' INTERNAL STRUCTS STATUS *********");
6240 6238
6241 printf("*** Edje\n"); 6239 INF("*** Edje\n");
6242 printf(" path: '%s'\n", ed->path); 6240 INF(" path: '%s'", ed->path);
6243 printf(" group: '%s'\n", ed->group); 6241 INF(" group: '%s'", ed->group);
6244 printf(" parent: '%s'\n", ed->parent); 6242 INF(" parent: '%s'", ed->parent);
6245 6243
6246 printf("\n*** Parts [table:%d list:%d]\n", ed->table_parts_size, 6244 INF("*** Parts [table:%d list:%d]", ed->table_parts_size,
6247 eina_list_count(ed->collection->parts)); 6245 eina_list_count(ed->collection->parts));
6248 EINA_LIST_FOREACH(ed->collection->parts, l, p) 6246 EINA_LIST_FOREACH(ed->collection->parts, l, p)
6249 { 6247 {
6250 Edje_Real_Part *rp; 6248 Edje_Real_Part *rp;
@@ -6254,10 +6252,10 @@ edje_edit_print_internal_status(Evas_Object *obj)
6254 if (p == rp->part) 6252 if (p == rp->part)
6255 printf(" OK!\n"); 6253 printf(" OK!\n");
6256 else 6254 else
6257 printf(" WRONG (table[%id]->name = '%s')\n", p->id, rp->part->name); 6255 WRN(" WRONG (table[%id]->name = '%s')", p->id, rp->part->name);
6258 } 6256 }
6259 6257
6260 printf("\n*** Programs [table:%d list:%d]\n", ed->table_programs_size, 6258 INF("*** Programs [table:%d list:%d]", ed->table_programs_size,
6261 eina_list_count(ed->collection->programs)); 6259 eina_list_count(ed->collection->programs));
6262 EINA_LIST_FOREACH(ed->collection->programs, l, epr) 6260 EINA_LIST_FOREACH(ed->collection->programs, l, epr)
6263 { 6261 {
@@ -6268,10 +6266,10 @@ edje_edit_print_internal_status(Evas_Object *obj)
6268 if (epr == epr2) 6266 if (epr == epr2)
6269 printf(" OK!\n"); 6267 printf(" OK!\n");
6270 else 6268 else
6271 printf(" WRONG (table[%id]->name = '%s')\n", epr->id, epr2->name); 6269 WRN(" WRONG (table[%id]->name = '%s')", epr->id, epr2->name);
6272 } 6270 }
6273 6271
6274 printf("\n"); 6272 printf("\n");
6275 6273
6276 printf("****************** END ************************\n\n"); 6274 INF("****************** END ************************\n");
6277} 6275}
diff --git a/legacy/edje/src/lib/edje_embryo.c b/legacy/edje/src/lib/edje_embryo.c
index c67a129b3c..c561740191 100644
--- a/legacy/edje/src/lib/edje_embryo.c
+++ b/legacy/edje/src/lib/edje_embryo.c
@@ -2363,19 +2363,19 @@ _edje_embryo_test_run(Edje *ed, const char *fname, const char *sig, const char *
2363 ret = embryo_program_run(ed->collection->script, fn); 2363 ret = embryo_program_run(ed->collection->script, fn);
2364 if (ret == EMBRYO_PROGRAM_FAIL) 2364 if (ret == EMBRYO_PROGRAM_FAIL)
2365 { 2365 {
2366 printf("EDJE: ERROR with embryo script.\n" 2366 ERR("ERROR with embryo script.\n"
2367 "ENTRY POINT: %s\n" 2367 "ENTRY POINT: %s\n"
2368 "ERROR: %s\n", 2368 "ERROR: %s",
2369 fname, 2369 fname,
2370 embryo_error_string_get(embryo_program_error_get(ed->collection->script))); 2370 embryo_error_string_get(embryo_program_error_get(ed->collection->script)));
2371 } 2371 }
2372 else if (ret == EMBRYO_PROGRAM_TOOLONG) 2372 else if (ret == EMBRYO_PROGRAM_TOOLONG)
2373 { 2373 {
2374 printf("EDJE: ERROR with embryo script.\n" 2374 ERR("ERROR with embryo script.\n"
2375 "ENTRY POINT: %s\n" 2375 "ENTRY POINT: %s\n"
2376 "ERROR: Script exceeded maximum allowed cycle count of %i\n", 2376 "ERROR: Script exceeded maximum allowed cycle count of %i",
2377 fname, 2377 fname,
2378 embryo_program_max_cycle_run_get(ed->collection->script)); 2378 embryo_program_max_cycle_run_get(ed->collection->script));
2379 } 2379 }
2380 embryo_program_data_set(ed->collection->script, pdata); 2380 embryo_program_data_set(ed->collection->script, pdata);
2381 } 2381 }
diff --git a/legacy/edje/src/lib/edje_external.c b/legacy/edje/src/lib/edje_external.c
index 87af6a4f73..6d9a8ffdc4 100644
--- a/legacy/edje/src/lib/edje_external.c
+++ b/legacy/edje/src/lib/edje_external.c
@@ -38,7 +38,7 @@ edje_external_type_register(const char *type_name, const Edje_External_Type *typ
38 38
39 if (eina_hash_find(type_registry, type_name)) 39 if (eina_hash_find(type_registry, type_name))
40 { 40 {
41 printf("EDJE ERROR: external type '%s' already registered\n", type_name); 41 ERR("External type '%s' already registered", type_name);
42 return EINA_FALSE; 42 return EINA_FALSE;
43 } 43 }
44 return eina_hash_add(type_registry, type_name, type_info); 44 return eina_hash_add(type_registry, type_name, type_info);
@@ -284,13 +284,13 @@ _edje_external_type_add(const char *type_name, Evas *evas, Evas_Object *parent,
284 obj = type->add(type->data, evas, parent, params); 284 obj = type->add(type->data, evas, parent, params);
285 if (!obj) 285 if (!obj)
286 { 286 {
287 printf("EDJE ERROR: external type '%s' returned NULL from constructor\n", type_name); 287 ERR("External type '%s' returned NULL from constructor", type_name);
288 return NULL; 288 return NULL;
289 } 289 }
290 290
291 evas_object_data_set(obj, "Edje_External_Type", type); 291 evas_object_data_set(obj, "Edje_External_Type", type);
292 292
293 printf("evas object: %p, external type: %p, data_get: %p\n", obj, type, evas_object_data_get(obj, "Edje_External_Type")); 293 ERR("Evas object: %p, external type: %p, data_get: %p", obj, type, evas_object_data_get(obj, "Edje_External_Type"));
294 return obj; 294 return obj;
295} 295}
296 296
@@ -302,7 +302,7 @@ _edje_external_signal_emit(Evas_Object *obj, const char *emission, const char *s
302 type = evas_object_data_get(obj, "Edje_External_Type"); 302 type = evas_object_data_get(obj, "Edje_External_Type");
303 if (!type) 303 if (!type)
304 { 304 {
305 printf("EDJE ERROR: external type data not found.\n"); 305 ERR("External type data not found.");
306 return; 306 return;
307 } 307 }
308 308
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index f38b238c91..1397fe6728 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -393,7 +393,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
393 rp->param1.description = ep->default_desc; 393 rp->param1.description = ep->default_desc;
394 rp->chosen_description = rp->param1.description; 394 rp->chosen_description = rp->param1.description;
395 if (!rp->param1.description) 395 if (!rp->param1.description)
396 printf("EDJE ERROR: no default part description!\n"); 396 ERR("no default part description!");
397 397
398 switch (ep->type) 398 switch (ep->type)
399 { 399 {
@@ -1058,16 +1058,16 @@ _edje_file_free(Edje_File *edf)
1058 /* FIXME: free collection_hash and collection_cache */ 1058 /* FIXME: free collection_hash and collection_cache */
1059 if (edf->collection_hash) 1059 if (edf->collection_hash)
1060 { 1060 {
1061 printf("EDJE ERROR:\n" 1061 ERR("EDJE ERROR:\n"
1062 "\n" 1062 "\n"
1063 "Naughty Programmer - spank spank!\n" 1063 "Naughty Programmer - spank spank!\n"
1064 "\n" 1064 "\n"
1065 "This program as probably called edje_shutdown() with active Edje objects\n" 1065 "This program as probably called edje_shutdown() with active Edje objects\n"
1066 "still around.\n This can cause problems as both Evas and Edje retain\n" 1066 "still around.\n This can cause problems as both Evas and Edje retain\n"
1067 "references to the objects. you should shut down all canvases and objects\n" 1067 "references to the objects. you should shut down all canvases and objects\n"
1068 "before calling edje_shutdown().\n" 1068 "before calling edje_shutdown().\n"
1069 "The following errors are the edje object files and parts that are still\n" 1069 "The following errors are the edje object files and parts that are still\n"
1070 "hanging around, with their reference counts\n"); 1070 "hanging around, with their reference counts");
1071 eina_hash_foreach(edf->collection_hash, 1071 eina_hash_foreach(edf->collection_hash,
1072 _edje_file_collection_hash_foreach, edf); 1072 _edje_file_collection_hash_foreach, edf);
1073 eina_hash_free(edf->collection_hash); 1073 eina_hash_free(edf->collection_hash);
@@ -1184,9 +1184,9 @@ _edje_file_collection_hash_foreach(const Eina_Hash *hash __UNUSED__, const void
1184 1184
1185 edf = fdata; 1185 edf = fdata;
1186 coll = data; 1186 coll = data;
1187 printf("EEK: EDJE FILE: \"%s\" ref(%i) PART: \"%s\" ref(%i) \n", 1187 ERR("EEK: EDJE FILE: \"%s\" ref(%i) PART: \"%s\" ref(%i) ",
1188 edf->path, edf->references, 1188 edf->path, edf->references,
1189 coll->part, coll->references); 1189 coll->part, coll->references);
1190 _edje_collection_free(edf, coll); 1190 _edje_collection_free(edf, coll);
1191 1191
1192 return 1; 1192 return 1;
diff --git a/legacy/edje/src/lib/edje_lua.c b/legacy/edje/src/lib/edje_lua.c
index 7d4c2ac9bd..f7d16ed25e 100644
--- a/legacy/edje/src/lib/edje_lua.c
+++ b/legacy/edje/src/lib/edje_lua.c
@@ -163,7 +163,7 @@ _edje_lua_error(lua_State *L, int err_code)
163 err_type = "unknown"; 163 err_type = "unknown";
164 break; 164 break;
165 } 165 }
166 fprintf(stderr, "Lua %s error: %s\n", err_type, lua_tostring(L, -1)); 166 ERR("Lua %s error: %s", err_type, lua_tostring(L, -1));
167 // don't exit. this is BAD. lua script bugs will cause thngs like e to 167 // don't exit. this is BAD. lua script bugs will cause thngs like e to
168 // exit mysteriously endig your x session. bad! 168 // exit mysteriously endig your x session. bad!
169 // exit(-1); 169 // exit(-1);
@@ -5029,9 +5029,8 @@ _edje_lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
5029 ela->cur += nsize - osize; 5029 ela->cur += nsize - osize;
5030 if (ela->cur > ela->max) 5030 if (ela->cur > ela->max)
5031 { 5031 {
5032 fprintf(stderr, 5032 ERR("Edje Lua memory limit of %i bytes reached (%i allocated)",
5033 "Edje Lua memory limit of %i bytes reached (%i allocated)\n", 5033 ela->max, ela->cur);
5034 ela->max, ela->cur);
5035 return NULL; 5034 return NULL;
5036 } 5035 }
5037 if (nsize == 0) 5036 if (nsize == 0)
@@ -5055,7 +5054,7 @@ _edje_lua_init()
5055 Ledje = lua_newstate(_edje_lua_alloc, &ela); 5054 Ledje = lua_newstate(_edje_lua_alloc, &ela);
5056 if (!Ledje) 5055 if (!Ledje)
5057 { 5056 {
5058 fprintf(stderr, "Lua error: Lua state could not be initialized\n"); 5057 ERR("Lua error: Lua state could not be initialized");
5059 exit(-1); 5058 exit(-1);
5060 } 5059 }
5061 5060
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index c71a3567ba..f7061c3276 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -7,18 +7,10 @@
7#include "edje_private.h" 7#include "edje_private.h"
8 8
9static int _edje_init_count = 0; 9static int _edje_init_count = 0;
10static int _edje_log_dom_global = -1; 10int _edje_default_log_dom = -1;
11Eina_Mempool *_edje_real_part_mp = NULL; 11Eina_Mempool *_edje_real_part_mp = NULL;
12Eina_Mempool *_edje_real_part_state_mp = NULL; 12Eina_Mempool *_edje_real_part_state_mp = NULL;
13 13
14#ifdef EDJE_DEFAULT_LOG_COLOR
15# undef EDJE_DEFAULT_LOG_COLOR
16#endif
17#define EDJE_DEFAULT_LOG_COLOR EINA_COLOR_CYAN
18#ifdef ERR
19# undef ERR
20#endif
21#define ERR(...) EINA_LOG_DOM_ERR(_edje_log_dom_global, __VA_ARGS__)
22 14
23 15
24/*============================================================================* 16/*============================================================================*
@@ -68,8 +60,8 @@ edje_init(void)
68 return --_edje_init_count; 60 return --_edje_init_count;
69 } 61 }
70 62
71 _edje_log_dom_global = eina_log_domain_register("Edje", EDJE_DEFAULT_LOG_COLOR); 63 _edje_default_log_dom = eina_log_domain_register("Edje", EDJE_DEFAULT_LOG_COLOR);
72 if (_edje_log_dom_global < 0) 64 if (_edje_default_log_dom < 0)
73 { 65 {
74 EINA_LOG_ERR("Edje Can not create a general log domain."); 66 EINA_LOG_ERR("Edje Can not create a general log domain.");
75 goto shutdown_eina; 67 goto shutdown_eina;
@@ -142,8 +134,8 @@ edje_init(void)
142 shutdown_ecore_job: 134 shutdown_ecore_job:
143 ecore_job_shutdown(); 135 ecore_job_shutdown();
144 unregister_log_domain: 136 unregister_log_domain:
145 eina_log_domain_unregister(_edje_log_dom_global); 137 eina_log_domain_unregister(_edje_default_log_dom);
146 _edje_log_dom_global = -1; 138 _edje_default_log_dom = -1;
147 shutdown_eina: 139 shutdown_eina:
148 eina_shutdown(); 140 eina_shutdown();
149 return --_edje_init_count; 141 return --_edje_init_count;
@@ -199,8 +191,8 @@ edje_shutdown(void)
199 eet_shutdown(); 191 eet_shutdown();
200 embryo_shutdown(); 192 embryo_shutdown();
201 ecore_job_shutdown(); 193 ecore_job_shutdown();
202 eina_log_domain_unregister(_edje_log_dom_global); 194 eina_log_domain_unregister(_edje_default_log_dom);
203 _edje_log_dom_global = -1; 195 _edje_default_log_dom = -1;
204 eina_shutdown(); 196 eina_shutdown();
205 197
206 return _edje_init_count; 198 return _edje_init_count;
diff --git a/legacy/edje/src/lib/edje_match.c b/legacy/edje/src/lib/edje_match.c
index 5775734164..57ad23f2b2 100644
--- a/legacy/edje/src/lib/edje_match.c
+++ b/legacy/edje/src/lib/edje_match.c
@@ -288,7 +288,7 @@ _edje_match_patterns_exec_init_states(Edje_States *states,
288 r->patterns[i] = str; \ 288 r->patterns[i] = str; \
289 \ 289 \
290 if (Show) \ 290 if (Show) \
291 fprintf(stderr, "%i [%s]\n", i, str); \ 291 INF("%i [%s]", i, str); \
292 \ 292 \
293 r->finals[i] = 0; \ 293 r->finals[i] = 0; \
294 for (j = 0; str[j]; ++j) \ 294 for (j = 0; str[j]; ++j) \
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 205aeb93c2..06bc7b2ccb 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -25,7 +25,28 @@
25 25
26#include <lua.h> 26#include <lua.h>
27#include <lauxlib.h> 27#include <lauxlib.h>
28EAPI extern int _edje_default_log_dom ;
28 29
30#ifdef EDJE_DEFAULT_LOG_COLOR
31# undef EDJE_DEFAULT_LOG_COLOR
32#endif
33#define EDJE_DEFAULT_LOG_COLOR EINA_COLOR_CYAN
34#ifdef ERR
35# undef ERR
36#endif
37#define ERR(...) EINA_LOG_DOM_ERR(_edje_default_log_dom, __VA_ARGS__)
38#ifdef INF
39# undef INF
40#endif
41#define INF(...) EINA_LOG_DOM_INFO(_edje_default_log_dom, __VA_ARGS__)
42#ifdef WRN
43# undef WRN
44#endif
45#define WRN(...) EINA_LOG_DOM_WARN(_edje_default_log_dom, __VA_ARGS__)
46#ifdef CRIT
47# undef CRIT
48#endif
49#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__)
29#ifdef __GNUC__ 50#ifdef __GNUC__
30# if __GNUC__ >= 4 51# if __GNUC__ >= 4
31// BROKEN in gcc 4 on amd64 52// BROKEN in gcc 4 on amd64
diff --git a/legacy/edje/src/lib/edje_program.c b/legacy/edje/src/lib/edje_program.c
index ab51431c58..7b536d4810 100644
--- a/legacy/edje/src/lib/edje_program.c
+++ b/legacy/edje/src/lib/edje_program.c
@@ -615,8 +615,8 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, const char *ssig, const
615 } 615 }
616 if ((recursions >= 64) || (recursion_limit)) 616 if ((recursions >= 64) || (recursion_limit))
617 { 617 {
618 printf("EDJE ERROR: programs recursing up to recursion limit of %i. Disabled.\n", 618 ERR("Programs recursing up to recursion limit of %i. Disabled.",
619 64); 619 64);
620 recursion_limit = 1; 620 recursion_limit = 1;
621 return; 621 return;
622 } 622 }
diff --git a/legacy/edje/src/lib/edje_script_only.c b/legacy/edje/src/lib/edje_script_only.c
index 76c8a4a989..090626f3de 100644
--- a/legacy/edje/src/lib/edje_script_only.c
+++ b/legacy/edje/src/lib/edje_script_only.c
@@ -643,18 +643,18 @@ _call_fn(Edje * ed, const char *fname, Embryo_Function fn)
643 ret = embryo_program_run(ed->collection->script, fn); 643 ret = embryo_program_run(ed->collection->script, fn);
644 if (ret == EMBRYO_PROGRAM_FAIL) 644 if (ret == EMBRYO_PROGRAM_FAIL)
645 { 645 {
646 printf("EDJE: ERROR with embryo script.\n" 646 ERR("ERROR with embryo script.\n"
647 "ENTRY POINT: %s\n" 647 "ENTRY POINT: %s\n"
648 "ERROR: %s\n", 648 "ERROR: %s",
649 fname, 649 fname,
650 embryo_error_string_get(embryo_program_error_get 650 embryo_error_string_get(embryo_program_error_get
651 (ed->collection->script))); 651 (ed->collection->script)));
652 } 652 }
653 else if (ret == EMBRYO_PROGRAM_TOOLONG) 653 else if (ret == EMBRYO_PROGRAM_TOOLONG)
654 { 654 {
655 printf("EDJE: ERROR with embryo script.\n" 655 ERR("ERROR with embryo script.\n"
656 "ENTRY POINT: %s\n" 656 "ENTRY POINT: %s\n"
657 "ERROR: Script exceeded maximum allowed cycle count of %i\n", 657 "ERROR: Script exceeded maximum allowed cycle count of %i",
658 fname, embryo_program_max_cycle_run_get(ed->collection->script)); 658 fname, embryo_program_max_cycle_run_get(ed->collection->script));
659 } 659 }
660} 660}
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index ff0a11f99b..3b9fc464de 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -61,7 +61,7 @@ edje_freeze(void)
61{ 61{
62#ifdef FASTFREEZE 62#ifdef FASTFREEZE
63 _edje_freeze_val++; 63 _edje_freeze_val++;
64 printf("fr ++ ->%i\n", _edje_freeze_val); 64 INF("fr ++ ->%i", _edje_freeze_val);
65#else 65#else
66// FIXME: could just have a global freeze instead of per object 66// FIXME: could just have a global freeze instead of per object
67// above i tried.. but this broke some things. notable e17's menus. why? 67// above i tried.. but this broke some things. notable e17's menus. why?
@@ -111,7 +111,7 @@ edje_thaw(void)
111 111
112#ifdef FASTFREEZE 112#ifdef FASTFREEZE
113 _edje_freeze_val--; 113 _edje_freeze_val--;
114 printf("fr -- ->%i\n", _edje_freeze_val); 114 INF("fr -- ->%i", _edje_freeze_val);
115 if ((_edje_freeze_val <= 0) && (_edje_freeze_calc_count > 0)) 115 if ((_edje_freeze_val <= 0) && (_edje_freeze_calc_count > 0))
116 { 116 {
117 Eina_List *l; 117 Eina_List *l;
@@ -2348,9 +2348,8 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(*
2348 2348
2349 if (_edje_box_layout_builtin_find(name)) 2349 if (_edje_box_layout_builtin_find(name))
2350 { 2350 {
2351 fprintf(stderr, 2351 ERR("Cannot register layout '%s': would override builtin!",
2352 "ERROR: cannot register layout '%s': would override builtin!\n", 2352 name);
2353 name);
2354 2353
2355 if (data && free_data) free_data(data); 2354 if (data && free_data) free_data(data);
2356 return; 2355 return;
@@ -2703,11 +2702,11 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
2703 } 2702 }
2704 if ((ed->w > 4000) || (ed->h > 4000)) 2703 if ((ed->w > 4000) || (ed->h > 4000))
2705 { 2704 {
2706 printf("EDJE ERROR: file %s, group %s has a non-fixed part. add fixed: 1 1; ???\n", 2705 ERR("file %s, group %s has a non-fixed part. add fixed: 1 1; ???",
2707 ed->path, ed->group); 2706 ed->path, ed->group);
2708 if (pep) 2707 if (pep)
2709 printf(" Problem part is: %s\n", pep->part->name); 2708 ERR(" Problem part is: %s", pep->part->name);
2710 printf(" Will recalc min size not allowing broken parts to affect the result.\n"); 2709 ERR(" Will recalc min size not allowing broken parts to affect the result.");
2711 if (reset_maxwh) 2710 if (reset_maxwh)
2712 { 2711 {
2713 reset_maxwh = 0; 2712 reset_maxwh = 0;
@@ -2763,7 +2762,7 @@ edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val
2763 if (!rp) 2762 if (!rp)
2764 { 2763 {
2765 if (val_ret) *val_ret = 0; 2764 if (val_ret) *val_ret = 0;
2766 printf("part not found\n"); 2765 INF("part not found");
2767 return ""; 2766 return "";
2768 } 2767 }
2769 if (rp->chosen_description) 2768 if (rp->chosen_description)