jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=571342bf2e6c85e01d12943fa9ce52ba11680346
commit 571342bf2e6c85e01d12943fa9ce52ba11680346 Author: Jaehyun Cho <[email protected]> Date: Wed Aug 24 21:24:06 2016 +0900 Revert "code refactoring." This reverts commit 6d5ce9daca1f6dd1015872088bc8251f5f88a0fd. --- src/lib/build.c | 14 ++++++++++---- src/lib/enventor_private.h | 1 - src/lib/util.c | 13 +------------ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/lib/build.c b/src/lib/build.c index 6e03862..c470f9f 100644 --- a/src/lib/build.c +++ b/src/lib/build.c @@ -5,8 +5,6 @@ #include <Enventor.h> #include "enventor_private.h" - - typedef struct builder_s { Eina_Strbuf *strbuf; @@ -148,14 +146,22 @@ build_edc(void) char *cur_dir = ecore_file_realpath("./"); if (!cur_dir) goto err; - if (change_cur_dir(edc_dir)) goto err; +#ifdef _WIN32 + if (_chdir(edc_dir)) goto err; +#else + if (chdir(edc_dir)) goto err; +#endif Ecore_Exe_Flags flags = (ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR); ecore_exe_pipe_run(bd->build_cmd, flags, NULL); - if (change_cur_dir(cur_dir)) goto err; +#ifdef _WIN32 + if (_chdir(cur_dir)) goto err; +#else + if (chdir(cur_dir)) goto err; +#endif err: if (edc_dir) free(edc_dir); diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h index 28c3e02..dbce81c 100644 --- a/src/lib/enventor_private.h +++ b/src/lib/enventor_private.h @@ -310,7 +310,6 @@ Eina_List *edit_group_list_get(edit_data *ed); /* util */ void mem_fail_msg(void); const char* part_type_str_convert(Edje_Part_Type type); -int change_cur_dir(const char *dir); /* reference */ void ref_init(void); diff --git a/src/lib/util.c b/src/lib/util.c index d676dcb..43b2358 100644 --- a/src/lib/util.c +++ b/src/lib/util.c @@ -5,18 +5,7 @@ #include <Enventor.h> #include "enventor_private.h" -int -change_cur_dir(const char *dir) -{ -#ifdef _WIN32 - return _chdir(dir); -#else - return chdir(dir); -#endif -} - -void -mem_fail_msg(void) +void mem_fail_msg(void) { EINA_LOG_ERR("Failed to allocate Memory!"); } --
