aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-06 11:09:51 -0400
committerChris Michael <cp.michael@samsung.com>2018-07-06 11:09:51 -0400
commit65b3eb27c24ad5f248eea4bbde0d2d090aed25de (patch)
treec77bf53a05133e135ea94622548c1a74d1745102 /src/bin
parentselection_manager: Silence silly ERR messages (diff)
downloadefl-65b3eb27c24ad5f248eea4bbde0d2d090aed25de.tar.gz
Revert "edje_cc: temporarily disable aborting compile when namespace validation fails"
Summary: This reverts commit 0dc492087ed048f153bc45f488f1504034fdcd30. there are no longer any errors here so this should fail the build any time errors are introduced Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6525
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/edje/edje_cc_out.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index a28cc48505..d94c4aa25e 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -245,17 +245,6 @@ static int cur_image_entry;
static void data_write_images(void);
-static void
-print_error(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- eina_log_vprint(_edje_cc_log_dom, EINA_LOG_LEVEL_CRITICAL,
- "unknown", "unknown", 0, fmt, ap);
- va_end(ap);
-}
-
void
error_and_abort(Eet_File *ef EINA_UNUSED, const char *fmt, ...)
{
@@ -600,7 +589,7 @@ check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Commo
}
static void
-_part_namespace_verify(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef EINA_UNUSED, Eina_Bool ns_required)
+_part_namespace_verify(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef, Eina_Bool ns_required)
{
char buf[1024], *p;
size_t len;
@@ -625,7 +614,7 @@ _part_namespace_verify(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef EIN
if ((!ns_required) && (!p)) return;
if (strncmp(ep->name, buf, len))
- print_error("Part '%s' from group %s is not properly namespaced (should begin with '%s.')!", ep->name, de->entry, buf);
+ error_and_abort(ef, "Part '%s' from group %s is not properly namespaced (should begin with '%s.')!", ep->name, de->entry, buf);
}
static void
@@ -691,7 +680,7 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef)
}
static void
-_program_signal_namespace_verify(Edje_Part_Collection *pc, Eet_File *ef EINA_UNUSED, const char *sig, const char *src)
+_program_signal_namespace_verify(Edje_Part_Collection *pc, Eet_File *ef, const char *sig, const char *src)
{
char buf[1024], *p;
size_t len;
@@ -714,7 +703,7 @@ _program_signal_namespace_verify(Edje_Part_Collection *pc, Eet_File *ef EINA_UNU
if (eina_strlcpy(buf, de->entry, len + 1) >= sizeof(buf)) return;
if (strncmp(sig, buf, len))
- print_error("SIGNAL_EMIT (%s:%s) does not match group namespace (%s)!", sig, src, de->entry);
+ error_and_abort(ef, "SIGNAL_EMIT (%s:%s) does not match group namespace (%s)!", sig, src, de->entry);
}
static void