summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2020-05-07 09:27:07 -0400
committerChristopher Michael <devilhorns@comcast.net>2020-05-07 09:27:07 -0400
commitd135957ffa0ae429f4ca22662de8633771984485 (patch)
tree8dcacdd71c83d4c5a7ffb239e428dd81e5d725df /src/lib
parentde939ca64b3d17ee786f3fc621314fce1746334e (diff)
Use __func__ C99 identifier instead of __FUNCTION__ compiler extension
Summary: see http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1124.pdf section 6.4.2.2 page 52 Test Plan: compilation Reviewers: raster, devilhorns Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11785
Diffstat (limited to '')
-rw-r--r--src/lib/ecore/ecore_private.h4
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_ssl_conn-openssl.c4
-rw-r--r--src/lib/ecore_con/efl_net_ssl_ctx-openssl.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c8
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c14
-rw-r--r--src/lib/ecore_file/ecore_file_download.c2
-rw-r--r--src/lib/edje/edje_private.h4
-rw-r--r--src/lib/efreet/efreet_menu.c4
-rw-r--r--src/lib/eina/eina_debug_private.h4
-rw-r--r--src/lib/eina/eina_lock.h4
-rw-r--r--src/lib/eina/eina_log.h6
-rw-r--r--src/lib/eina/eina_magic.h4
-rw-r--r--src/lib/eina/eina_promise.c2
-rw-r--r--src/lib/eina/eina_promise.h22
-rw-r--r--src/lib/eina/eina_safety_checks.h2
-rw-r--r--src/lib/elementary/efl_ui_win.c18
-rw-r--r--src/lib/elementary/elm_gesture_layer_extra_gestures.c16
-rw-r--r--src/lib/embryo/embryo_main.c2
-rw-r--r--src/lib/eo/eo.c10
-rw-r--r--src/lib/eo/eo_private.h10
-rw-r--r--src/lib/eo/eo_ptr_indirection.h10
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c2
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c4
-rw-r--r--src/lib/evil/evil_util.c16
29 files changed, 94 insertions, 94 deletions
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index e60c191a21..8e9b796c2c 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -270,7 +270,7 @@ ecore_print_warning(const char *function,
270#define CHECK_PARAM_POINTER_RETURN(sparam, param, ret) \ 270#define CHECK_PARAM_POINTER_RETURN(sparam, param, ret) \
271 if (!(param)) \ 271 if (!(param)) \
272 { \ 272 { \
273 ecore_print_warning(__FUNCTION__, sparam); \ 273 ecore_print_warning(__func__, sparam); \
274 return ret; \ 274 return ret; \
275 } 275 }
276 276
@@ -278,7 +278,7 @@ ecore_print_warning(const char *function,
278#define CHECK_PARAM_POINTER(sparam, param) \ 278#define CHECK_PARAM_POINTER(sparam, param) \
279 if (!(param)) \ 279 if (!(param)) \
280 { \ 280 { \
281 ecore_print_warning(__FUNCTION__, sparam); \ 281 ecore_print_warning(__func__, sparam); \
282 return; \ 282 return; \
283 } 283 }
284 284
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 050a30f1f2..e171d79078 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -95,7 +95,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
95 if (!svr) return __VA_ARGS__; \ 95 if (!svr) return __VA_ARGS__; \
96 if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ 96 if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \
97 { \ 97 { \
98 ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \ 98 ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __func__); \
99 return __VA_ARGS__; \ 99 return __VA_ARGS__; \
100 } \ 100 } \
101 } \ 101 } \
@@ -115,7 +115,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
115 if (!cl) return __VA_ARGS__; \ 115 if (!cl) return __VA_ARGS__; \
116 if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ 116 if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \
117 { \ 117 { \
118 ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \ 118 ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __func__); \
119 return __VA_ARGS__; \ 119 return __VA_ARGS__; \
120 } \ 120 } \
121 } \ 121 } \
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index ec1e5b1a0c..b1d95f14f6 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -161,7 +161,7 @@ struct _Ecore_Con_Url
161 { \ 161 { \
162 if (!EINA_MAGIC_CHECK(u, ECORE_MAGIC_CON_URL)) \ 162 if (!EINA_MAGIC_CHECK(u, ECORE_MAGIC_CON_URL)) \
163 { \ 163 { \
164 ECORE_MAGIC_FAIL(u, ECORE_MAGIC_CON_URL, __FUNCTION__); \ 164 ECORE_MAGIC_FAIL(u, ECORE_MAGIC_CON_URL, __func__); \
165 return __VA_ARGS__; \ 165 return __VA_ARGS__; \
166 } \ 166 } \
167 EINA_SAFETY_ON_TRUE_RETURN_VAL(u->delete_me, __VA_ARGS__); \ 167 EINA_SAFETY_ON_TRUE_RETURN_VAL(u->delete_me, __VA_ARGS__); \
diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
index 8e7339c2ea..e59c6811c9 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -195,7 +195,7 @@ struct _Efl_Net_Ssl_Conn
195#define EFL_NET_SOCKET_SSL_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5" 195#define EFL_NET_SOCKET_SSL_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5"
196 196
197#define _efl_net_ssl_conn_session_debug(conn) \ 197#define _efl_net_ssl_conn_session_debug(conn) \
198 __efl_net_ssl_conn_session_debug(__FILE__, __LINE__, __FUNCTION__, conn) 198 __efl_net_ssl_conn_session_debug(__FILE__, __LINE__, __func__, conn)
199static void 199static void
200__efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname, Efl_Net_Ssl_Conn *conn) 200__efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname, Efl_Net_Ssl_Conn *conn)
201{ 201{
@@ -294,7 +294,7 @@ __efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname,
294} 294}
295 295
296#define _efl_net_ssl_conn_check_errors() \ 296#define _efl_net_ssl_conn_check_errors() \
297 __efl_net_ssl_conn_check_errors(__FILE__, __LINE__, __FUNCTION__) 297 __efl_net_ssl_conn_check_errors(__FILE__, __LINE__, __func__)
298static unsigned long 298static unsigned long
299__efl_net_ssl_conn_check_errors(const char *file, int line, const char *fname) 299__efl_net_ssl_conn_check_errors(const char *file, int line, const char *fname)
300{ 300{
diff --git a/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c b/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
index d8e4b6e220..3cf2d2f90b 100644
--- a/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
@@ -17,7 +17,7 @@ struct _Efl_Net_Ssl_Ctx
17#define EFL_NET_SSL_CONTEXT_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5" 17#define EFL_NET_SSL_CONTEXT_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5"
18 18
19#define _efl_net_ssl_ctx_check_errors() \ 19#define _efl_net_ssl_ctx_check_errors() \
20 __efl_net_ssl_ctx_check_errors(__FILE__, __LINE__, __FUNCTION__) 20 __efl_net_ssl_ctx_check_errors(__FILE__, __LINE__, __func__)
21static unsigned long 21static unsigned long
22__efl_net_ssl_ctx_check_errors(const char *file, int line, const char *fname) 22__efl_net_ssl_ctx_check_errors(const char *file, int line, const char *fname)
23{ 23{
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 87331f03e8..46112d9537 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -44,14 +44,14 @@
44#define ECORE_EVAS_CHECK(ee, ...) \ 44#define ECORE_EVAS_CHECK(ee, ...) \
45 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) \ 45 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) \
46 { \ 46 { \
47 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); \ 47 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__); \
48 return __VA_ARGS__; \ 48 return __VA_ARGS__; \
49 } 49 }
50 50
51#define ECORE_EVAS_CHECK_GOTO(_ee, _label) \ 51#define ECORE_EVAS_CHECK_GOTO(_ee, _label) \
52 if (!ECORE_MAGIC_CHECK(_ee, ECORE_MAGIC_EVAS)) \ 52 if (!ECORE_MAGIC_CHECK(_ee, ECORE_MAGIC_EVAS)) \
53 { \ 53 { \
54 ECORE_MAGIC_FAIL(_ee, ECORE_MAGIC_EVAS, __FUNCTION__); \ 54 ECORE_MAGIC_FAIL(_ee, ECORE_MAGIC_EVAS, __func__); \
55 goto _label; \ 55 goto _label; \
56 } 56 }
57 57
@@ -2785,13 +2785,13 @@ ecore_evas_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
2785EAPI void 2785EAPI void
2786ecore_evas_draw_frame_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool draw_frame EINA_UNUSED) 2786ecore_evas_draw_frame_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool draw_frame EINA_UNUSED)
2787{ 2787{
2788 WRN("Calling deprecated function %s (not implemented)", __FUNCTION__); 2788 WRN("Calling deprecated function %s (not implemented)", __func__);
2789} 2789}
2790 2790
2791EAPI Eina_Bool 2791EAPI Eina_Bool
2792ecore_evas_draw_frame_get(const Ecore_Evas *ee EINA_UNUSED) 2792ecore_evas_draw_frame_get(const Ecore_Evas *ee EINA_UNUSED)
2793{ 2793{
2794 WRN("Calling deprecated function %s (not implemented)", __FUNCTION__); 2794 WRN("Calling deprecated function %s (not implemented)", __func__);
2795 return EINA_FALSE; 2795 return EINA_FALSE;
2796} 2796}
2797 2797
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 7b07fdc699..43558ec767 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -86,13 +86,13 @@ _ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
86static void 86static void
87_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) 87_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
88{ 88{
89 INF("TODO: %s", __FUNCTION__); 89 INF("TODO: %s", __func__);
90} 90}
91 91
92static void 92static void
93_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) 93_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
94{ 94{
95 INF("TODO: %s", __FUNCTION__); 95 INF("TODO: %s", __func__);
96} 96}
97 97
98static void 98static void
@@ -227,12 +227,12 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_
227 227
228 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 228 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
229 { 229 {
230 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 230 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
231 return EINA_FALSE; 231 return EINA_FALSE;
232 } 232 }
233 233
234 CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE); 234 CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE);
235 if (!_ecore_evas_object_evas_check(__FUNCTION__, ee, obj)) 235 if (!_ecore_evas_object_evas_check(__func__, ee, obj))
236 return EINA_FALSE; 236 return EINA_FALSE;
237 237
238 old_ee = _evas_object_associate_get(obj); 238 old_ee = _evas_object_associate_get(obj);
@@ -255,7 +255,7 @@ ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
255 255
256 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 256 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
257 { 257 {
258 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 258 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
259 return EINA_FALSE; 259 return EINA_FALSE;
260 } 260 }
261 261
@@ -284,7 +284,7 @@ ecore_evas_object_associate_get(const Ecore_Evas *ee)
284{ 284{
285 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 285 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
286 { 286 {
287 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 287 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
288 return NULL; 288 return NULL;
289 } 289 }
290 return _ecore_evas_associate_get(ee); 290 return _ecore_evas_associate_get(ee);
@@ -380,7 +380,7 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
380 380
381 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 381 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
382 { 382 {
383 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 383 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
384 } 384 }
385 else 385 else
386 { 386 {
diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c
index 4b65c51ee6..e212ea0fbf 100644
--- a/src/lib/ecore_file/ecore_file_download.c
+++ b/src/lib/ecore_file/ecore_file_download.c
@@ -305,7 +305,7 @@ ecore_file_download_abort(Ecore_File_Download_Job *job)
305 return; 305 return;
306 if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) 306 if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB))
307 { 307 {
308 ECORE_MAGIC_FAIL(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB, __FUNCTION__); 308 ECORE_MAGIC_FAIL(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB, __func__);
309 return; 309 return;
310 } 310 }
311 311
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 03e288c567..818a62195f 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2757,7 +2757,7 @@ void _edje_lua_shutdown(void);
2757 2757
2758void __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code); 2758void __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code);
2759#define _edje_lua_error(L, err_code) \ 2759#define _edje_lua_error(L, err_code) \
2760 __edje_lua_error(__FILE__, __FUNCTION__, __LINE__, L, err_code) 2760 __edje_lua_error(__FILE__, __func__, __LINE__, L, err_code)
2761 2761
2762Eina_Bool _edje_lua_script_only(Edje *ed); 2762Eina_Bool _edje_lua_script_only(Edje *ed);
2763void _edje_lua_script_only_init(Edje *ed); 2763void _edje_lua_script_only_init(Edje *ed);
@@ -2892,7 +2892,7 @@ EAPI void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p);
2892EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p); 2892EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p);
2893 2893
2894void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code); 2894void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code);
2895#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __FUNCTION__, __LINE__, L, err_code) 2895#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __func__, __LINE__, L, err_code)
2896void _edje_lua2_script_init(Edje *ed); 2896void _edje_lua2_script_init(Edje *ed);
2897void _edje_lua2_script_shutdown(Edje *ed); 2897void _edje_lua2_script_shutdown(Edje *ed);
2898void _edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size); 2898void _edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size);
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index 06c2c418fb..e45cb678b4 100644
--- a/src/lib/efreet/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -531,7 +531,7 @@ efreet_menu_file_set(const char *file)
531EFREET_DEPRECATED_API EAPI void 531EFREET_DEPRECATED_API EAPI void
532efreet_menu_async_get(Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED) 532efreet_menu_async_get(Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
533{ 533{
534 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 534 ERR("%s is deprecated and shouldn't be called", __func__);
535 535
536 return; 536 return;
537} 537}
@@ -575,7 +575,7 @@ efreet_menu_get(void)
575EFREET_DEPRECATED_API EAPI void 575EFREET_DEPRECATED_API EAPI void
576efreet_menu_async_parse(const char *path EINA_UNUSED, Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED) 576efreet_menu_async_parse(const char *path EINA_UNUSED, Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
577{ 577{
578 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 578 ERR("%s is deprecated and shouldn't be called", __func__);
579 579
580 return; 580 return;
581} 581}
diff --git a/src/lib/eina/eina_debug_private.h b/src/lib/eina/eina_debug_private.h
index a635c2072d..dbe4df771a 100644
--- a/src/lib/eina/eina_debug_private.h
+++ b/src/lib/eina/eina_debug_private.h
@@ -12,8 +12,8 @@
12#define REMOTE_SERVER_PORT 6666 12#define REMOTE_SERVER_PORT 6666
13 13
14#ifdef DEBUGON 14#ifdef DEBUGON
15# define e_debug(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "\n", getpid(), __FUNCTION__, __LINE__, ##args) 15# define e_debug(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "\n", getpid(), __func__, __LINE__, ##args)
16# define e_debug_begin(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "", getpid(), __FUNCTION__, __LINE__, ##args) 16# define e_debug_begin(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "", getpid(), __func__, __LINE__, ##args)
17# define e_debug_continue(fmt, args...) fprintf(stderr, fmt, ##args) 17# define e_debug_continue(fmt, args...) fprintf(stderr, fmt, ##args)
18# define e_debug_end() fprintf(stderr, "\n") 18# define e_debug_end() fprintf(stderr, "\n")
19#else 19#else
diff --git a/src/lib/eina/eina_lock.h b/src/lib/eina/eina_lock.h
index d173f6be34..14c6ff270f 100644
--- a/src/lib/eina/eina_lock.h
+++ b/src/lib/eina/eina_lock.h
@@ -618,7 +618,7 @@ static inline void eina_spinlock_free(Eina_Spinlock *spinlock);
618 { \ 618 { \
619 EINA_LOG_ERR("You are calling %s from outside" \ 619 EINA_LOG_ERR("You are calling %s from outside" \
620 "of the main loop threads in %s at line %i", \ 620 "of the main loop threads in %s at line %i", \
621 __FUNCTION__, \ 621 __func__, \
622 __FILE__, \ 622 __FILE__, \
623 __LINE__); \ 623 __LINE__); \
624 return val; \ 624 return val; \
@@ -630,7 +630,7 @@ static inline void eina_spinlock_free(Eina_Spinlock *spinlock);
630 { \ 630 { \
631 EINA_LOG_ERR("You are calling %s from outside" \ 631 EINA_LOG_ERR("You are calling %s from outside" \
632 "of the main loop threads in %s at line %i", \ 632 "of the main loop threads in %s at line %i", \
633 __FUNCTION__, \ 633 __func__, \
634 __FILE__, \ 634 __FILE__, \
635 __LINE__); \ 635 __LINE__); \
636 return ; \ 636 return ; \
diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h
index b4254fed4f..7b4e17e9a9 100644
--- a/src/lib/eina/eina_log.h
+++ b/src/lib/eina/eina_log.h
@@ -142,7 +142,7 @@
142 * custom data can be passed to that callback, powerful display 142 * custom data can be passed to that callback, powerful display
143 * messages can be displayed. 143 * messages can be displayed.
144 * 144 *
145 * It is suggested to not use __FILE__, __FUNCTION__ or __LINE__ when 145 * It is suggested to not use __FILE__, __func__ or __LINE__ when
146 * writing that callback, but when defining macros (like 146 * writing that callback, but when defining macros (like
147 * EINA_LOG_ERR() and other macros). 147 * EINA_LOG_ERR() and other macros).
148 * 148 *
@@ -304,7 +304,7 @@ EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
304# define EINA_LOG(DOM, LEVEL, fmt, ...) \ 304# define EINA_LOG(DOM, LEVEL, fmt, ...) \
305 do { \ 305 do { \
306 if (LEVEL <= EINA_LOG_LEVEL_MAXIMUM) { \ 306 if (LEVEL <= EINA_LOG_LEVEL_MAXIMUM) { \
307 eina_log_print(DOM, LEVEL, __FILE__, __FUNCTION__, __LINE__, \ 307 eina_log_print(DOM, LEVEL, __FILE__, __func__, __LINE__, \
308 fmt, ## __VA_ARGS__); } \ 308 fmt, ## __VA_ARGS__); } \
309 } while (0) 309 } while (0)
310# else 310# else
@@ -312,7 +312,7 @@ EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
312 eina_log_print(DOM, \ 312 eina_log_print(DOM, \
313 LEVEL, \ 313 LEVEL, \
314 __FILE__, \ 314 __FILE__, \
315 __FUNCTION__, \ 315 __func__, \
316 __LINE__, \ 316 __LINE__, \
317 fmt, \ 317 fmt, \
318 ## __VA_ARGS__) 318 ## __VA_ARGS__)
diff --git a/src/lib/eina/eina_magic.h b/src/lib/eina/eina_magic.h
index 7222f045f2..a2a7cba350 100644
--- a/src/lib/eina/eina_magic.h
+++ b/src/lib/eina/eina_magic.h
@@ -249,7 +249,7 @@ EAPI extern Eina_Error EINA_ERROR_MAGIC_FAILED;
249/** 249/**
250 * @def EINA_MAGIC_FAIL(d, m) 250 * @def EINA_MAGIC_FAIL(d, m)
251 * @brief Definition to call eina_magic_fail() with the parameters @p d, @p d->__magic, 251 * @brief Definition to call eina_magic_fail() with the parameters @p d, @p d->__magic,
252 * @p m, __FILE__, __FUNCTION__, and __LINE__. @p d must be a structure that 252 * @p m, __FILE__, __func__, and __LINE__. @p d must be a structure that
253 * holds an Eina magic number declaration. Use #EINA_MAGIC to add such a 253 * holds an Eina magic number declaration. Use #EINA_MAGIC to add such a
254 * declaration. 254 * declaration.
255 * 255 *
@@ -261,7 +261,7 @@ EAPI extern Eina_Error EINA_ERROR_MAGIC_FAILED;
261 (d) ? (d)->__magic : 0, \ 261 (d) ? (d)->__magic : 0, \
262 (m), \ 262 (m), \
263 __FILE__, \ 263 __FILE__, \
264 __FUNCTION__, \ 264 __func__, \
265 __LINE__); 265 __LINE__);
266 266
267/** 267/**
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index 4255f7b41c..ee7fc93249 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -98,7 +98,7 @@
98#undef CRI 98#undef CRI
99#define CRI(...) EINA_LOG_DOM_CRIT(_promise_log_dom, __VA_ARGS__) 99#define CRI(...) EINA_LOG_DOM_CRIT(_promise_log_dom, __VA_ARGS__)
100 100
101#define _eina_promise_value_dbg(_msg, _p, _v) __eina_promise_value_dbg(_msg, _p, _v, __LINE__, __FUNCTION__) 101#define _eina_promise_value_dbg(_msg, _p, _v) __eina_promise_value_dbg(_msg, _p, _v, __LINE__, __func__)
102 102
103struct _Eina_Promise { 103struct _Eina_Promise {
104 Eina_Future *future; 104 Eina_Future *future;
diff --git a/src/lib/eina/eina_promise.h b/src/lib/eina/eina_promise.h
index 7bd120ec0f..cad96b4049 100644
--- a/src/lib/eina/eina_promise.h
+++ b/src/lib/eina/eina_promise.h
@@ -1091,7 +1091,7 @@ EAPI Eina_Future *eina_future_then_from_desc(Eina_Future *prev, const Eina_Futur
1091 * fill the following fields: 1091 * fill the following fields:
1092 * 1092 *
1093 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used. 1093 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used.
1094 * @li Eina_Future_Cb_Log_Desc::func: The `__FUNCTION__` macro will be used. 1094 * @li Eina_Future_Cb_Log_Desc::func: The `__func__` macro will be used.
1095 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used. 1095 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used.
1096 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used. 1096 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used.
1097 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used. 1097 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used.
@@ -1752,7 +1752,7 @@ eina_future_race_array(Eina_Future *array[])
1752 * This macro will set the following fields of the #Eina_Future_Cb_Log_Desc: 1752 * This macro will set the following fields of the #Eina_Future_Cb_Log_Desc:
1753 * 1753 *
1754 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used. 1754 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used.
1755 * @li Eina_Future_Cb_Log_Desc::func: The `__FUNCTION__` macro will be used. 1755 * @li Eina_Future_Cb_Log_Desc::func: The `__func__` macro will be used.
1756 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used. 1756 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used.
1757 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used. 1757 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used.
1758 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used. 1758 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used.
@@ -1765,7 +1765,7 @@ eina_future_race_array(Eina_Future *array[])
1765 */ 1765 */
1766#define eina_future_cb_log_dbg(_prefix, _suffix) \ 1766#define eina_future_cb_log_dbg(_prefix, _suffix) \
1767 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1767 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1768 __FUNCTION__, EINA_LOG_LEVEL_DBG, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1768 __func__, EINA_LOG_LEVEL_DBG, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1769 1769
1770/** 1770/**
1771 * A syntactic sugar over eina_future_cb_log_from_desc(). 1771 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1773,7 +1773,7 @@ eina_future_race_array(Eina_Future *array[])
1773 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1773 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1774 * 1774 *
1775 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1775 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1776 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1776 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1777 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_CRITICAL will be used. 1777 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_CRITICAL will be used.
1778 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1778 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1779 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1779 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1786,7 +1786,7 @@ eina_future_race_array(Eina_Future *array[])
1786 */ 1786 */
1787#define eina_future_cb_log_crit(_prefix, _suffix) \ 1787#define eina_future_cb_log_crit(_prefix, _suffix) \
1788 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1788 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1789 __FUNCTION__, EINA_LOG_LEVEL_CRITICAL, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1789 __func__, EINA_LOG_LEVEL_CRITICAL, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1790 1790
1791/** 1791/**
1792 * A syntactic sugar over eina_future_cb_log_from_desc(). 1792 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1794,7 +1794,7 @@ eina_future_race_array(Eina_Future *array[])
1794 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1794 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1795 * 1795 *
1796 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1796 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1797 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1797 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1798 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_ERR will be used. 1798 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_ERR will be used.
1799 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1799 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1800 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1800 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1807,7 +1807,7 @@ eina_future_race_array(Eina_Future *array[])
1807 */ 1807 */
1808#define eina_future_cb_log_err(_prefix, _suffix) \ 1808#define eina_future_cb_log_err(_prefix, _suffix) \
1809 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1809 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1810 __FUNCTION__, EINA_LOG_LEVEL_ERR, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1810 __func__, EINA_LOG_LEVEL_ERR, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1811 1811
1812/** 1812/**
1813 * A syntactic sugar over eina_future_cb_log_from_desc(). 1813 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1815,7 +1815,7 @@ eina_future_race_array(Eina_Future *array[])
1815 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1815 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1816 * 1816 *
1817 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1817 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1818 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1818 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1819 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_INFO will be used. 1819 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_INFO will be used.
1820 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1820 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1821 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1821 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1828,7 +1828,7 @@ eina_future_race_array(Eina_Future *array[])
1828 */ 1828 */
1829#define eina_future_cb_log_info(_prefix, _suffix) \ 1829#define eina_future_cb_log_info(_prefix, _suffix) \
1830 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1830 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1831 __FUNCTION__, EINA_LOG_LEVEL_INFO, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1831 __func__, EINA_LOG_LEVEL_INFO, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1832 1832
1833/** 1833/**
1834 * A syntactic sugar over eina_future_cb_log_from_desc(). 1834 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1836,7 +1836,7 @@ eina_future_race_array(Eina_Future *array[])
1836 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1836 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1837 * 1837 *
1838 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1838 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1839 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1839 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1840 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_WARN will be used. 1840 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_WARN will be used.
1841 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1841 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1842 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1842 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1852,7 +1852,7 @@ eina_future_race_array(Eina_Future *array[])
1852 */ 1852 */
1853#define eina_future_cb_log_warn(_prefix, _suffix) \ 1853#define eina_future_cb_log_warn(_prefix, _suffix) \
1854 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1854 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1855 __FUNCTION__, EINA_LOG_LEVEL_WARN, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1855 __func__, EINA_LOG_LEVEL_WARN, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1856 1856
1857/** 1857/**
1858 * A syntactic sugar over eina_future_then() and eina_future_cb_easy(). 1858 * A syntactic sugar over eina_future_then() and eina_future_cb_easy().
diff --git a/src/lib/eina/eina_safety_checks.h b/src/lib/eina/eina_safety_checks.h
index 27551290d6..0819a1079f 100644
--- a/src/lib/eina/eina_safety_checks.h
+++ b/src/lib/eina/eina_safety_checks.h
@@ -105,7 +105,7 @@ EAPI extern Eina_Error EINA_ERROR_SAFETY_FAILED;
105 * @internal 105 * @internal
106 */ 106 */
107EAPI void _eina_safety_error(const char *file, const char *func, int line, const char *str); 107EAPI void _eina_safety_error(const char *file, const char *func, int line, const char *str);
108# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __FUNCTION__, __LINE__, msg) 108# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __func__, __LINE__, msg)
109# else 109# else
110# define EINA_SAFETY_ERROR(msg) EINA_LOG_ERR("%s", msg) 110# define EINA_SAFETY_ERROR(msg) EINA_LOG_ERR("%s", msg)
111# endif 111# endif
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 1ceda1513b..816c7e20fd 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1010,13 +1010,13 @@ _elm_win_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
1010static void 1010static void
1011_elm_win_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) 1011_elm_win_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
1012{ 1012{
1013 INF("TODO: %s", __FUNCTION__); 1013 INF("TODO: %s", __func__);
1014} 1014}
1015 1015
1016static void 1016static void
1017_elm_win_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) 1017_elm_win_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
1018{ 1018{
1019 INF("TODO: %s", __FUNCTION__); 1019 INF("TODO: %s", __func__);
1020} 1020}
1021 1021
1022static void 1022static void
@@ -9160,45 +9160,45 @@ elm_win_available_profiles_set(Elm_Win *obj, const char **profiles, unsigned int
9160EAPI void 9160EAPI void
9161elm_win_fake_canvas_set(Evas_Object *obj EINA_UNUSED, Ecore_Evas *oee EINA_UNUSED) 9161elm_win_fake_canvas_set(Evas_Object *obj EINA_UNUSED, Ecore_Evas *oee EINA_UNUSED)
9162{ 9162{
9163 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9163 ERR("Calling deprecrated function '%s'", __func__);
9164} 9164}
9165 9165
9166EAPI void 9166EAPI void
9167elm_win_name_set(Evas_Object *obj, const char *name) 9167elm_win_name_set(Evas_Object *obj, const char *name)
9168{ 9168{
9169 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9169 ERR("Calling deprecrated function '%s'", __func__);
9170 efl_ui_win_name_set(obj, name); 9170 efl_ui_win_name_set(obj, name);
9171} 9171}
9172 9172
9173EAPI void 9173EAPI void
9174elm_win_type_set(Evas_Object *obj, Elm_Win_Type type) 9174elm_win_type_set(Evas_Object *obj, Elm_Win_Type type)
9175{ 9175{
9176 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9176 ERR("Calling deprecrated function '%s'", __func__);
9177 efl_ui_win_type_set(obj, _elm_win_type_to_efl_ui_win_type(type)); 9177 efl_ui_win_type_set(obj, _elm_win_type_to_efl_ui_win_type(type));
9178} 9178}
9179 9179
9180EAPI void 9180EAPI void
9181elm_win_teamwork_uri_preload(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED) 9181elm_win_teamwork_uri_preload(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
9182{ 9182{
9183 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9183 ERR("Calling deprecrated function '%s'", __func__);
9184} 9184}
9185 9185
9186EAPI void 9186EAPI void
9187elm_win_teamwork_uri_show(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED) 9187elm_win_teamwork_uri_show(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
9188{ 9188{
9189 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9189 ERR("Calling deprecrated function '%s'", __func__);
9190} 9190}
9191 9191
9192EAPI void 9192EAPI void
9193elm_win_teamwork_uri_hide(Efl_Ui_Win *obj EINA_UNUSED) 9193elm_win_teamwork_uri_hide(Efl_Ui_Win *obj EINA_UNUSED)
9194{ 9194{
9195 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9195 ERR("Calling deprecrated function '%s'", __func__);
9196} 9196}
9197 9197
9198EAPI void 9198EAPI void
9199elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED) 9199elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
9200{ 9200{
9201 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9201 ERR("Calling deprecrated function '%s'", __func__);
9202} 9202}
9203 9203
9204/* What here follows is code that implements the glue between ecore evas and efl_ui* side */ 9204/* What here follows is code that implements the glue between ecore evas and efl_ui* side */
diff --git a/src/lib/elementary/elm_gesture_layer_extra_gestures.c b/src/lib/elementary/elm_gesture_layer_extra_gestures.c
index b7bce1926c..dd663a8e79 100644
--- a/src/lib/elementary/elm_gesture_layer_extra_gestures.c
+++ b/src/lib/elementary/elm_gesture_layer_extra_gestures.c
@@ -50,7 +50,7 @@ _tap_long_single_tap_start_cb(void *data, void *event_info)
50 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 50 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
51 if (!info->nb_taps_on_single) 51 if (!info->nb_taps_on_single)
52 { 52 {
53 gl_debug("\n%s\n", __FUNCTION__); 53 gl_debug("\n%s\n", __func__);
54 _cb_call(info, ELM_GESTURE_STATE_START, event_info); 54 _cb_call(info, ELM_GESTURE_STATE_START, event_info);
55 } 55 }
56 return flags; 56 return flags;
@@ -63,7 +63,7 @@ _tap_long_single_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
63 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 63 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
64 if (!info->long_tap_started) 64 if (!info->long_tap_started)
65 { 65 {
66 gl_debug("%s\n", __FUNCTION__); 66 gl_debug("%s\n", __func__);
67 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL); 67 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL);
68 info->nb_taps_on_single = 0; 68 info->nb_taps_on_single = 0;
69 } 69 }
@@ -73,7 +73,7 @@ _tap_long_single_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
73static Eina_Bool 73static Eina_Bool
74_tap_long_timeout(void *data) 74_tap_long_timeout(void *data)
75{ 75{
76 gl_debug("%s\n", __FUNCTION__); 76 gl_debug("%s\n", __func__);
77 Tap_Longpress_Info *info = data; 77 Tap_Longpress_Info *info = data;
78 _tap_long_single_tap_abort_cb(info, NULL); 78 _tap_long_single_tap_abort_cb(info, NULL);
79 info->timer_between_taps = NULL; 79 info->timer_between_taps = NULL;
@@ -83,7 +83,7 @@ _tap_long_timeout(void *data)
83static Evas_Event_Flags 83static Evas_Event_Flags
84_tap_long_single_tap_end_cb(void *data, void *event_info) 84_tap_long_single_tap_end_cb(void *data, void *event_info)
85{ 85{
86 gl_debug("%s\n", __FUNCTION__); 86 gl_debug("%s\n", __func__);
87 Tap_Longpress_Info *info = data; 87 Tap_Longpress_Info *info = data;
88 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 88 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
89 double timeout_between_taps = elm_gesture_layer_double_tap_timeout_get(info->obj); 89 double timeout_between_taps = elm_gesture_layer_double_tap_timeout_get(info->obj);
@@ -100,7 +100,7 @@ _tap_long_long_tap_start_cb(void *data, void *event_info EINA_UNUSED)
100 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 100 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
101 if (info->nb_taps_on_single && info->timer_between_taps) 101 if (info->nb_taps_on_single && info->timer_between_taps)
102 { 102 {
103 gl_debug("%s\n", __FUNCTION__); 103 gl_debug("%s\n", __func__);
104 info->long_tap_started = EINA_TRUE; 104 info->long_tap_started = EINA_TRUE;
105 ecore_timer_del(info->timer_between_taps); 105 ecore_timer_del(info->timer_between_taps);
106 info->timer_between_taps = NULL; 106 info->timer_between_taps = NULL;
@@ -115,7 +115,7 @@ _tap_long_long_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
115 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 115 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
116 if (info->long_tap_started) 116 if (info->long_tap_started)
117 { 117 {
118 gl_debug("%s\n", __FUNCTION__); 118 gl_debug("%s\n", __func__);
119 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL); 119 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL);
120 info->nb_taps_on_single = 0; 120 info->nb_taps_on_single = 0;
121 info->long_tap_started = EINA_FALSE; 121 info->long_tap_started = EINA_FALSE;
@@ -136,7 +136,7 @@ _tap_long_long_tap_move_cb(void *data, void *event_info)
136 } 136 }
137 else 137 else
138 { 138 {
139 gl_debug("%s\n", __FUNCTION__); 139 gl_debug("%s\n", __func__);
140 _cb_call(info, ELM_GESTURE_STATE_MOVE, event_info); 140 _cb_call(info, ELM_GESTURE_STATE_MOVE, event_info);
141 } 141 }
142 } 142 }
@@ -150,7 +150,7 @@ _tap_long_long_tap_end_cb(void *data, void *event_info)
150 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 150 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
151 if (info->long_tap_started) 151 if (info->long_tap_started)
152 { 152 {
153 gl_debug("%s\n", __FUNCTION__); 153 gl_debug("%s\n", __func__);
154 _cb_call(info, ELM_GESTURE_STATE_END, event_info); 154 _cb_call(info, ELM_GESTURE_STATE_END, event_info);
155 info->long_tap_started = EINA_FALSE; 155 info->long_tap_started = EINA_FALSE;
156 info->nb_taps_on_single = 0; 156 info->nb_taps_on_single = 0;
diff --git a/src/lib/embryo/embryo_main.c b/src/lib/embryo/embryo_main.c
index 4b2af3c5e5..852b1903f2 100644
--- a/src/lib/embryo/embryo_main.c
+++ b/src/lib/embryo/embryo_main.c
@@ -52,7 +52,7 @@ embryo_shutdown(void)
52{ 52{
53 if (_embryo_init_count <= 0) 53 if (_embryo_init_count <= 0)
54 { 54 {
55 printf("%s:%i Init count not greater than 0 in shutdown.", __FUNCTION__, __LINE__); 55 printf("%s:%i Init count not greater than 0 in shutdown.", __func__, __LINE__);
56 return 0; 56 return 0;
57 } 57 }
58 if (--_embryo_init_count != 0) 58 if (--_embryo_init_count != 0)
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index b93497372c..f5d880918f 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -989,7 +989,7 @@ err_vtable:
989static Eo * 989static Eo *
990_efl_add_internal_start_do(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data) 990_efl_add_internal_start_do(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data)
991{ 991{
992 const char *func_name = __FUNCTION__; 992 const char *func_name = __func__;
993 _Eo_Object *obj; 993 _Eo_Object *obj;
994 Eo_Stack_Frame *fptr = NULL; 994 Eo_Stack_Frame *fptr = NULL;
995 995
@@ -1981,7 +1981,7 @@ efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
1981 efl_ref(obj_id); 1981 efl_ref(obj_id);
1982 1982
1983#ifdef EO_DEBUG 1983#ifdef EO_DEBUG
1984 const char *func_name = __FUNCTION__; 1984 const char *func_name = __func__;
1985 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, obj_id); 1985 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, obj_id);
1986 1986
1987 Eo_Xref_Node *xref = calloc(1, sizeof(*xref)); 1987 Eo_Xref_Node *xref = calloc(1, sizeof(*xref));
@@ -2092,7 +2092,7 @@ efl_unref(const Eo *obj_id)
2092 { 2092 {
2093 ERR("Obj:%s@%p. User refcount (%d) < 0. Too many unrefs.", 2093 ERR("Obj:%s@%p. User refcount (%d) < 0. Too many unrefs.",
2094 obj->klass->desc->name, obj_id, obj->user_refcount); 2094 obj->klass->desc->name, obj_id, obj->user_refcount);
2095 _eo_log_obj_report((Eo_Id)obj_id, EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 2095 _eo_log_obj_report((Eo_Id)obj_id, EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
2096 EO_OBJ_DONE(obj_id); 2096 EO_OBJ_DONE(obj_id);
2097 _efl_unref(obj); 2097 _efl_unref(obj);
2098 return; 2098 return;
@@ -2336,7 +2336,7 @@ efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_C
2336{ 2336{
2337 void *ret = NULL; 2337 void *ret = NULL;
2338 _Efl_Class *klass = NULL; 2338 _Efl_Class *klass = NULL;
2339 const char *func_name = __FUNCTION__; 2339 const char *func_name = __func__;
2340 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, NULL); 2340 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, NULL);
2341 EO_OBJ_POINTER_PROXY(ref_obj_id, ref_obj); 2341 EO_OBJ_POINTER_PROXY(ref_obj_id, ref_obj);
2342 if (ref_obj) 2342 if (ref_obj)
@@ -3476,7 +3476,7 @@ _eo_log_obj_shutdown(void)
3476 entry->klass, 3476 entry->klass,
3477 entry->klass->desc->name, 3477 entry->klass->desc->name,
3478 entry->timestamp - _eo_log_time_start, now - entry->timestamp); 3478 entry->timestamp - _eo_log_time_start, now - entry->timestamp);
3479 _eo_log_obj_entry_show(entry, EINA_LOG_LEVEL_DBG, __FUNCTION__, __FILE__, __LINE__, now); 3479 _eo_log_obj_entry_show(entry, EINA_LOG_LEVEL_DBG, __func__, __FILE__, __LINE__, now);
3480 leaks++; 3480 leaks++;
3481 } 3481 }
3482 } 3482 }
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 2c902d8456..c719cb4c54 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -323,7 +323,7 @@ _efl_ref(_Eo_Object *obj)
323 return obj; 323 return obj;
324} 324}
325 325
326#define _efl_unref(obj) _efl_unref_internal(obj, __FUNCTION__, __FILE__, __LINE__) 326#define _efl_unref(obj) _efl_unref_internal(obj, __func__, __FILE__, __LINE__)
327static inline void 327static inline void
328_efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, int line) 328_efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, int line)
329{ 329{
@@ -333,27 +333,27 @@ _efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, in
333 if (obj->user_refcount > 0) 333 if (obj->user_refcount > 0)
334 { 334 {
335 ERR("Object %p is still refcounted %i by users, but internal refcount reached 0. This should never happen. Please report a bug and send a backtrace to EFL developer.", (Eo*) obj->header.id, obj->user_refcount); 335 ERR("Object %p is still refcounted %i by users, but internal refcount reached 0. This should never happen. Please report a bug and send a backtrace to EFL developer.", (Eo*) obj->header.id, obj->user_refcount);
336 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 336 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
337 return; 337 return;
338 } 338 }
339 if (obj->refcount < 0) 339 if (obj->refcount < 0)
340 { 340 {
341 ERR("in %s:%d: func '%s' Obj:%p. Refcount (%d) < 0. Too many unrefs.", file, line, func_name, obj, obj->refcount); 341 ERR("in %s:%d: func '%s' Obj:%p. Refcount (%d) < 0. Too many unrefs.", file, line, func_name, obj, obj->refcount);
342 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 342 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
343 return; 343 return;
344 } 344 }
345 345
346 if (obj->destructed) 346 if (obj->destructed)
347 { 347 {
348 ERR("in %s:%d: func '%s' Object %p already destructed.", file, line, func_name, _eo_obj_id_get(obj)); 348 ERR("in %s:%d: func '%s' Object %p already destructed.", file, line, func_name, _eo_obj_id_get(obj));
349 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 349 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
350 return; 350 return;
351 } 351 }
352 352
353 if (obj->del_triggered) 353 if (obj->del_triggered)
354 { 354 {
355 ERR("in %s:%d: func '%s' Object %p deletion already triggered. You wrongly call efl_unref() within a destructor.", file, line, func_name, _eo_obj_id_get(obj)); 355 ERR("in %s:%d: func '%s' Object %p deletion already triggered. You wrongly call efl_unref() within a destructor.", file, line, func_name, _eo_obj_id_get(obj));
356 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 356 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
357 return; 357 return;
358 } 358 }
359 359
diff --git a/src/lib/eo/eo_ptr_indirection.h b/src/lib/eo/eo_ptr_indirection.h
index 33dc709d42..cb811404bc 100644
--- a/src/lib/eo/eo_ptr_indirection.h
+++ b/src/lib/eo/eo_ptr_indirection.h
@@ -9,12 +9,12 @@
9void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file, int line, const char *fmt, ...); 9void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file, int line, const char *fmt, ...);
10 10
11#define _EO_POINTER_ERR(obj_id, fmt, ...) \ 11#define _EO_POINTER_ERR(obj_id, fmt, ...) \
12 _eo_pointer_error(obj_id, __FUNCTION__, __FILE__, __LINE__, fmt, __VA_ARGS__) 12 _eo_pointer_error(obj_id, __func__, __FILE__, __LINE__, fmt, __VA_ARGS__)
13 13
14#define EO_OBJ_POINTER(obj_id, obj) \ 14#define EO_OBJ_POINTER(obj_id, obj) \
15 _Eo_Object *obj; \ 15 _Eo_Object *obj; \
16 do { \ 16 do { \
17 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 17 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
18 } while (0) 18 } while (0)
19 19
20#define EO_OBJ_POINTER_PROXY(obj_id, obj) \ 20#define EO_OBJ_POINTER_PROXY(obj_id, obj) \
@@ -26,7 +26,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
26#define EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, ret) \ 26#define EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, ret) \
27 _Eo_Object *obj; \ 27 _Eo_Object *obj; \
28 do { \ 28 do { \
29 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 29 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
30 if (!obj) return (ret); \ 30 if (!obj) return (ret); \
31 } while (0) 31 } while (0)
32 32
@@ -41,7 +41,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
41#define EO_OBJ_POINTER_RETURN(obj_id, obj) \ 41#define EO_OBJ_POINTER_RETURN(obj_id, obj) \
42 _Eo_Object *obj; \ 42 _Eo_Object *obj; \
43 do { \ 43 do { \
44 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 44 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
45 if (!obj) return; \ 45 if (!obj) return; \
46 } while (0) 46 } while (0)
47 47
@@ -55,7 +55,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
55#define EO_OBJ_POINTER_GOTO(obj_id, obj, label) \ 55#define EO_OBJ_POINTER_GOTO(obj_id, obj, label) \
56 _Eo_Object *obj; \ 56 _Eo_Object *obj; \
57 do { \ 57 do { \
58 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 58 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
59 if (!obj) goto label; \ 59 if (!obj) goto label; \
60 } while (0) 60 } while (0)
61 61
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 14ab286acd..aca5d31181 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -731,7 +731,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
731 if (e->delete_me) return; 731 if (e->delete_me) return;
732 if (e->current_event == EVAS_CALLBACK_LAST) 732 if (e->current_event == EVAS_CALLBACK_LAST)
733 { 733 {
734 ERR("%s() can only be called from an input event callback!", __FUNCTION__); 734 ERR("%s() can only be called from an input event callback!", __func__);
735 return; 735 return;
736 } 736 }
737 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, ); 737 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index f58dd3870c..d1dcf933ee 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -1122,7 +1122,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace)
1122 static int warned = 0; 1122 static int warned = 0;
1123 if (!warned) 1123 if (!warned)
1124 { 1124 {
1125 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 1125 ERR("%s is deprecated and shouldn't be called", __func__);
1126 warned = 1; 1126 warned = 1;
1127 } 1127 }
1128 1128
@@ -1198,7 +1198,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p
1198 static int warned = 0; 1198 static int warned = 0;
1199 if (!warned) 1199 if (!warned)
1200 { 1200 {
1201 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 1201 ERR("%s is deprecated and shouldn't be called", __func__);
1202 warned = 1; 1202 warned = 1;
1203 } 1203 }
1204 1204
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index eb4b9952ab..0992a39424 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -933,7 +933,7 @@ evas_object_del(Evas_Object *obj)
933 if (!efl_isa(obj, MY_CLASS)) 933 if (!efl_isa(obj, MY_CLASS))
934 { 934 {
935 ERR("Called %s on a non-evas object: %s@%p", 935 ERR("Called %s on a non-evas object: %s@%p",
936 __FUNCTION__, efl_class_name_get(obj), obj); 936 __func__, efl_class_name_get(obj), obj);
937 return; 937 return;
938 } 938 }
939 pd = efl_data_scope_get(obj, MY_CLASS); 939 pd = efl_data_scope_get(obj, MY_CLASS);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
index 2a86d271cb..78f58b5315 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
@@ -9,7 +9,7 @@
9 do { \ 9 do { \
10 static int _foo = 0; \ 10 static int _foo = 0; \
11 if (_foo++%10000 ==0) \ 11 if (_foo++%10000 ==0) \
12 printf("%s %+d %s: %d (%s)\n",__FILE__,__LINE__,__FUNCTION__,\ 12 printf("%s %+d %s: %d (%s)\n",__FILE__,__LINE__,__func__,\
13 _foo, x " optimised");\ 13 _foo, x " optimised");\
14 } while (0) 14 } while (0)
15#else 15#else
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index eaf39119a8..7249e01cec 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -594,7 +594,7 @@ _bool_parse(const char *str, Eina_Bool *b)
594#define PARSE_ABORT() do {} while (0) 594#define PARSE_ABORT() do {} while (0)
595//#define PARSE_ABORT() abort() 595//#define PARSE_ABORT() abort()
596 596
597#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __FUNCTION__, __LINE__); PARSE_ABORT(); goto end; } } while (0) 597#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __func__, __LINE__); PARSE_ABORT(); goto end; } } while (0)
598 598
599/* Buffers */ 599/* Buffers */
600static Buffer * 600static Buffer *
@@ -1924,7 +1924,7 @@ _padding_set_instruction_prepare(Evas_Filter_Program *pgm EINA_UNUSED,
1924/* Evas_Filter_Parser entry points */ 1924/* Evas_Filter_Parser entry points */
1925 1925
1926#undef PARSE_CHECK 1926#undef PARSE_CHECK
1927#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __FUNCTION__, __LINE__); PARSE_ABORT(); goto end; } } while (0) 1927#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __func__, __LINE__); PARSE_ABORT(); goto end; } } while (0)
1928 1928
1929EAPI void 1929EAPI void
1930evas_filter_program_del(Evas_Filter_Program *pgm) 1930evas_filter_program_del(Evas_Filter_Program *pgm)
diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c
index fc3c0607b2..f7c82c4f10 100644
--- a/src/lib/evil/evil_util.c
+++ b/src/lib/evil/evil_util.c
@@ -29,7 +29,7 @@ evil_char_to_wchar(const char *text)
29 (wsize > (int)(ULONG_MAX / sizeof(wchar_t)))) 29 (wsize > (int)(ULONG_MAX / sizeof(wchar_t))))
30 { 30 {
31 if (wsize == 0) 31 if (wsize == 0)
32 _evil_last_error_display(__FUNCTION__); 32 _evil_last_error_display(__func__);
33 return NULL; 33 return NULL;
34 } 34 }
35 35
@@ -37,7 +37,7 @@ evil_char_to_wchar(const char *text)
37 if (wtext) 37 if (wtext)
38 if (!MultiByteToWideChar(CP_ACP, 0, text, (int)strlen(text) + 1, wtext, wsize)) 38 if (!MultiByteToWideChar(CP_ACP, 0, text, (int)strlen(text) + 1, wtext, wsize))
39 { 39 {
40 _evil_last_error_display(__FUNCTION__); 40 _evil_last_error_display(__func__);
41 return NULL; 41 return NULL;
42 } 42 }
43 43
@@ -56,7 +56,7 @@ evil_wchar_to_char(const wchar_t *text)
56 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL); 56 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL);
57 if (asize == 0) 57 if (asize == 0)
58 { 58 {
59 _evil_last_error_display(__FUNCTION__); 59 _evil_last_error_display(__func__);
60 return NULL; 60 return NULL;
61 } 61 }
62 62
@@ -67,7 +67,7 @@ evil_wchar_to_char(const wchar_t *text)
67 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL); 67 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL);
68 if (asize == 0) 68 if (asize == 0)
69 { 69 {
70 _evil_last_error_display(__FUNCTION__); 70 _evil_last_error_display(__func__);
71 return NULL; 71 return NULL;
72 } 72 }
73 73
@@ -89,7 +89,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
89 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL); 89 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL);
90 if (size8 == 0) 90 if (size8 == 0)
91 { 91 {
92 _evil_last_error_display(__FUNCTION__); 92 _evil_last_error_display(__func__);
93 return NULL; 93 return NULL;
94 } 94 }
95 95
@@ -100,7 +100,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
100 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, text8, size8, NULL, NULL); 100 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, text8, size8, NULL, NULL);
101 if (size8 == 0) 101 if (size8 == 0)
102 { 102 {
103 _evil_last_error_display(__FUNCTION__); 103 _evil_last_error_display(__func__);
104 return NULL; 104 return NULL;
105 } 105 }
106 106
@@ -120,7 +120,7 @@ evil_utf8_to_utf16(const char *text)
120 size16 = MultiByteToWideChar(CP_UTF8, flag, text, -1, NULL, 0); 120 size16 = MultiByteToWideChar(CP_UTF8, flag, text, -1, NULL, 0);
121 if (size16 == 0) 121 if (size16 == 0)
122 { 122 {
123 _evil_last_error_display(__FUNCTION__); 123 _evil_last_error_display(__func__);
124 return NULL; 124 return NULL;
125 } 125 }
126 126
@@ -128,7 +128,7 @@ evil_utf8_to_utf16(const char *text)
128 if (text16) 128 if (text16)
129 if (!MultiByteToWideChar(CP_UTF8, flag, text, -1, text16, size16)) 129 if (!MultiByteToWideChar(CP_UTF8, flag, text, -1, text16, size16))
130 { 130 {
131 _evil_last_error_display(__FUNCTION__); 131 _evil_last_error_display(__func__);
132 return NULL; 132 return NULL;
133 } 133 }
134 134