diff options
author | Cedric Bail <cedric@osg.samsung.com> | 2018-02-22 14:56:31 -0800 |
---|---|---|
committer | Cedric Bail <cedric@osg.samsung.com> | 2018-02-22 14:56:31 -0800 |
commit | 16f604f4690e09eff4cdd6169ef936d99dbf58c4 (patch) | |
tree | 04f27ec697331f7be22a67be0074f89d22f88381 | |
parent | 288284585b38a668d1be1c69bc7523ecb7d98019 (diff) |
efl: fix warning due to vpath change.
Diffstat (limited to '')
-rw-r--r-- | src/lib/efl/interfaces/efl_file.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/efl/interfaces/efl_file.c b/src/lib/efl/interfaces/efl_file.c index 65060d858d..9f0be2e8a1 100644 --- a/src/lib/efl/interfaces/efl_file.c +++ b/src/lib/efl/interfaces/efl_file.c | |||
@@ -13,19 +13,21 @@ struct _Efl_File_Data | |||
13 | static Eina_Bool | 13 | static Eina_Bool |
14 | _efl_file_file_set(Eo *obj, Efl_File_Data *pd, const char *file, const char *key) | 14 | _efl_file_file_set(Eo *obj, Efl_File_Data *pd, const char *file, const char *key) |
15 | { | 15 | { |
16 | char *tmp = NULL; | ||
16 | Eina_File *f = NULL; | 17 | Eina_File *f = NULL; |
17 | Eina_Bool r = EINA_FALSE; | 18 | Eina_Bool r = EINA_FALSE; |
18 | 19 | ||
19 | pd->error = EFL_IMAGE_LOAD_ERROR_DOES_NOT_EXIST; | 20 | pd->error = EFL_IMAGE_LOAD_ERROR_DOES_NOT_EXIST; |
20 | 21 | ||
21 | if (file) | 22 | tmp = (char*)(file); |
23 | if (tmp) | ||
22 | { | 24 | { |
23 | file = eina_vpath_resolve(file); | 25 | tmp = eina_vpath_resolve(tmp); |
24 | } | 26 | } |
25 | 27 | ||
26 | if (file) | 28 | if (tmp) |
27 | { | 29 | { |
28 | f = eina_file_open(file, EINA_FALSE); | 30 | f = eina_file_open(tmp, EINA_FALSE); |
29 | if (!f) goto on_error; | 31 | if (!f) goto on_error; |
30 | } | 32 | } |
31 | 33 | ||
@@ -36,7 +38,7 @@ _efl_file_file_set(Eo *obj, Efl_File_Data *pd, const char *file, const char *key | |||
36 | 38 | ||
37 | on_error: | 39 | on_error: |
38 | 40 | ||
39 | free(file); | 41 | free(tmp); |
40 | return r; | 42 | return r; |
41 | } | 43 | } |
42 | 44 | ||