summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-02 20:00:49 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-02 20:15:58 +0900
commitb10be4e2ed76e7ff7d5d038c21b69c34dc0b196b (patch)
tree81fce486605e31889685a87b5bf2139a34795be3
parentde99a71c4393e68725882babcf6f736222055475 (diff)
evas filters: Disable extra debug
Forgot to remove that! It's better to disable for the release, DBG() and XDBG() are disabled anyway. CID 1308611
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c23
-rw-r--r--src/lib/evas/include/evas_filter.h4
2 files changed, 15 insertions, 12 deletions
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index ce1e25ac9d..df68b03580 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -2231,26 +2231,29 @@ static inline void
2231_lua_import_path_get(char *path, size_t len, const char *name) 2231_lua_import_path_get(char *path, size_t len, const char *name)
2232{ 2232{
2233 const char *pfx = _evas_module_datadir_get(); 2233 const char *pfx = _evas_module_datadir_get();
2234 size_t r; 2234 size_t r = 0;
2235 2235
2236#ifdef FILTERS_DEBUG 2236#ifdef FILTERS_DEBUG
2237 // This is a hack to fetch the most recent file from source 2237 // This is a hack to fetch the most recent file from source
2238 char *sep = evas_file_path_join("", ""); 2238 char *sep = evas_file_path_join("", "");
2239 char *src = strdup(__FILE__); 2239 char *src = strdup(__FILE__);
2240 char *slash = strrchr(src, *sep);
2241 struct stat st; 2240 struct stat st;
2242 if (slash) 2241 if (sep && src)
2243 { 2242 {
2244 *slash = '\0'; 2243 char *slash = strrchr(src, *sep);
2245 if (*src == '/') 2244 if (slash)
2246 r = snprintf(path, len - 1, "%s/lua/%s.lua", src, name); 2245 {
2247 else // abs_srcdir is unknown here 2246 *slash = '\0';
2248 r = snprintf(path, len - 1, "%s/src/%s/lua/%s.lua", PACKAGE_BUILD_DIR, src, name); 2247 if (*src == '/')
2249 if (r >= len) path[len - 1] = '\0'; 2248 r = snprintf(path, len - 1, "%s/lua/%s.lua", src, name);
2249 else // abs_srcdir is unknown here
2250 r = snprintf(path, len - 1, "%s/src/%s/lua/%s.lua", PACKAGE_BUILD_DIR, src, name);
2251 if (r >= len) path[len - 1] = '\0';
2252 }
2250 } 2253 }
2251 free(sep); 2254 free(sep);
2252 free(src); 2255 free(src);
2253 if (!stat(path, &st)) return; 2256 if (r && !stat(path, &st)) return;
2254#endif 2257#endif
2255 2258
2256 r = snprintf(path, len - 1, "%s/filters/lua/%s.lua", pfx ? pfx : ".", name); 2259 r = snprintf(path, len - 1, "%s/filters/lua/%s.lua", pfx ? pfx : ".", name);
diff --git a/src/lib/evas/include/evas_filter.h b/src/lib/evas/include/evas_filter.h
index c4da4e75c3..3f88970dc0 100644
--- a/src/lib/evas/include/evas_filter.h
+++ b/src/lib/evas/include/evas_filter.h
@@ -32,9 +32,9 @@
32# endif 32# endif
33#endif /* ! _WIN32 */ 33#endif /* ! _WIN32 */
34 34
35//#ifdef DEBUG 35#ifdef DEBUG
36# define FILTERS_DEBUG 36# define FILTERS_DEBUG
37//#endif 37#endif
38 38
39typedef struct _Evas_Filter_Instruction Evas_Filter_Instruction; 39typedef struct _Evas_Filter_Instruction Evas_Filter_Instruction;
40typedef struct _Evas_Filter_Buffer Evas_Filter_Buffer; 40typedef struct _Evas_Filter_Buffer Evas_Filter_Buffer;