summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-22 17:32:21 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-22 17:32:21 +0100
commita7dea04b2642397d3d545e2dbd0885939180d76c (patch)
treede357451c5368e2c1ca2f544db8f30729728dc71 /src/bin
parentd5599521172af414beb63ad52d68830e0c6fa1f4 (diff)
eolian: merge eo_file_parse and eot_file_parse
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/eolian/main.c9
-rw-r--r--src/bin/eolian_cxx/eolian_cxx.cc2
2 files changed, 2 insertions, 9 deletions
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index b198a234ed..22675fcb0a 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -397,14 +397,7 @@ int main(int argc, char **argv)
397 397
398 is_eo = eina_str_has_suffix(eo_filename, EO_SUFFIX); 398 is_eo = eina_str_has_suffix(eo_filename, EO_SUFFIX);
399 399
400 if (!is_eo && !eina_str_has_suffix(eo_filename, EOT_SUFFIX)) 400 if (!eolian_file_parse(eo_filename))
401 {
402 ERR("The input file %s doesn't have a correct extension (.eo/.eot).\n", eo_filename);
403 goto end;
404 }
405
406 if ((is_eo && !eolian_eo_file_parse(eo_filename)) ||
407 (!is_eo && !eolian_eot_file_parse(eo_filename)))
408 { 401 {
409 ERR("Error during parsing file %s\n", eo_filename); 402 ERR("Error during parsing file %s\n", eo_filename);
410 goto end; 403 goto end;
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index 7afa10da10..38084f422c 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -230,7 +230,7 @@ database_load(options_type const& opts)
230 } 230 }
231 if (!opts.in_file.empty()) 231 if (!opts.in_file.empty())
232 { 232 {
233 if (!::eolian_eo_file_parse(opts.in_file.c_str())) 233 if (!::eolian_file_parse(opts.in_file.c_str()))
234 { 234 {
235 EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain) 235 EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain)
236 << "Failed parsing: " << opts.in_file << "."; 236 << "Failed parsing: " << opts.in_file << ".";