enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Vincent Torri 2020-05-07 09:27:07 -04:00 committed by Christopher Michael
parent de939ca64b
commit d135957ffa
53 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/benchmarks/eina/Ecore_Data.h
View File

@ -69,7 +69,7 @@ extern "C" {
"\t%s();\n\n" \
"\tWith the parameter:\n\n" \
"\t%s\n\n" \
"\tbeing NULL. Please fix your program.", __FUNCTION__, sparam); \
"\tbeing NULL. Please fix your program.", __func__, sparam); \
if (getenv("ECORE_ERROR_ABORT")) { abort(); } \
return ret; \
}
@ -83,14 +83,14 @@ extern "C" {
"\t%s();\n\n" \
"\tWith the parameter:\n\n" \
"\t%s\n\n" \
"\tbeing NULL. Please fix your program.", __FUNCTION__, sparam); \
"\tbeing NULL. Please fix your program.", __func__, sparam); \
if (getenv("ECORE_ERROR_ABORT")) { abort(); } \
return; \
}
# ifdef __sgi
# define __FUNCTION__ "unknown"
# define __func__ "unknown"
# ifndef __cplusplus
# define inline
# endif

6
src/bin/elementary/test_dnd.c
View File

@ -635,7 +635,7 @@ _gl_dnd_default_anim_data_getcb(Evas_Object *obj, /* The genlist object */
/* Now, collect data to send for drop from ALL selected items */
/* Save list pointer to remove items after drop and free list on done */
info->data = _gl_get_drag_data(obj, it, (Eina_List **) &info->donecbdata);
printf("%s - data = %s\n", __FUNCTION__, info->data);
printf("%s - data = %s\n", __func__, info->data);
info->acceptdata = info->donecbdata;
if (info->data)
@ -740,7 +740,7 @@ _grid_data_getcb(Evas_Object *obj, /* The genlist object */
/* Now, collect data to send for drop from ALL selected items */
/* Save list pointer to remove items after drop and free list on done */
info->data = _grid_get_drag_data(obj, it, (Eina_List **) &info->donecbdata);
printf("%s %d- data = %s\n", __FUNCTION__, __LINE__, info->data);
printf("%s %d- data = %s\n", __func__, __LINE__, info->data);
info->acceptdata = info->donecbdata;
if (info->data)
@ -1005,7 +1005,7 @@ static Eina_Bool _drop_box_button_new_cb(void *data, Evas_Object *obj, Elm_Selec
void _enter_but_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
{
printf("Entered %s - drop it here and I will never print this line anymore.\n", __FUNCTION__);
printf("Entered %s - drop it here and I will never print this line anymore.\n", __func__);
}
static Eina_Bool _drop_but_icon_change_cb(void *data, Evas_Object *obj, Elm_Selection_Data *ev)

2
src/bindings/cxx/eina_cxx/eina_log.hh
View File

@ -210,7 +210,7 @@ inline void _log(std::stringstream const& stream, int domain, ::Eina_Log_Level l
for( bool run = ::eina_log_domain_level_check((DOMAIN), LEVEL); run;) \
for(std::stringstream stream; run ; \
::efl::eina::_log(std::move(stream), (DOMAIN), LEVEL \
, __FILE__, __FUNCTION__, __LINE__), run = false) \
, __FILE__, __func__, __LINE__), run = false) \
stream
/**

2
src/examples/eina/eina_log_03.c
View File

@ -7,7 +7,7 @@
#include <Eina.h>
#define log(fmt, ...) \
eina_log_print(EINA_LOG_LEVEL_ERR, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
eina_log_print(EINA_LOG_LEVEL_ERR, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__)
typedef struct _Data Data;

4
src/examples/eio/efl_io_manager_ls.c
View File

@ -29,7 +29,7 @@ done_cb(void *data EINA_UNUSED,
eina_value_get(&file, &value);
printf("%s done listing files %"PRIu64".\n", __FUNCTION__, value);
printf("%s done listing files %"PRIu64".\n", __func__, value);
}
ecore_main_loop_quit();
@ -46,7 +46,7 @@ progress_cb(void *data EINA_UNUSED, Eina_Array *array)
unsigned int count;
EINA_ARRAY_ITER_NEXT(array, count, filename, it)
printf("%s listing filename: %s\n", __FUNCTION__, filename);
printf("%s listing filename: %s\n", __func__, filename);
}
void list_files(void *data)

4
src/examples/eio/efl_io_manager_open.c
View File

@ -23,7 +23,7 @@ _closing_cb(void* data EINA_UNUSED,
}
else
{
printf("%s closed file.\n", __FUNCTION__);
printf("%s closed file.\n", __func__);
}
ecore_main_loop_quit();
@ -54,7 +54,7 @@ _open_cb(void *data,
eina_value_get(&file, &f);
printf("%s opened file %s\n", __FUNCTION__, eina_file_filename_get(f));
printf("%s opened file %s\n", __func__, eina_file_filename_get(f));
return eina_future_as_value(efl_io_manager_close(job, f));
}

2
src/examples/eio/efl_io_manager_open_multi.c
View File

@ -12,7 +12,7 @@
Eina_Value
_close_cb(void *data EINA_UNUSED, const Eina_Value array, const Eina_Future *dead EINA_UNUSED)
{
printf("%s closed all files.\n", __FUNCTION__);
printf("%s closed all files.\n", __func__);
ecore_main_loop_quit();

4
src/lib/ecore/ecore_private.h
View File

@ -270,7 +270,7 @@ ecore_print_warning(const char *function,
#define CHECK_PARAM_POINTER_RETURN(sparam, param, ret) \
if (!(param)) \
{ \
ecore_print_warning(__FUNCTION__, sparam); \
ecore_print_warning(__func__, sparam); \
return ret; \
}
@ -278,7 +278,7 @@ ecore_print_warning(const char *function,
#define CHECK_PARAM_POINTER(sparam, param) \
if (!(param)) \
{ \
ecore_print_warning(__FUNCTION__, sparam); \
ecore_print_warning(__func__, sparam); \
return; \
}

4
src/lib/ecore_con/ecore_con_legacy.c
View File

@ -95,7 +95,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
if (!svr) return __VA_ARGS__; \
if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \
{ \
ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \
ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __func__); \
return __VA_ARGS__; \
} \
} \
@ -115,7 +115,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
if (!cl) return __VA_ARGS__; \
if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \
{ \
ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \
ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __func__); \
return __VA_ARGS__; \
} \
} \

2
src/lib/ecore_con/ecore_con_url.c
View File

@ -161,7 +161,7 @@ struct _Ecore_Con_Url
{ \
if (!EINA_MAGIC_CHECK(u, ECORE_MAGIC_CON_URL)) \
{ \
ECORE_MAGIC_FAIL(u, ECORE_MAGIC_CON_URL, __FUNCTION__); \
ECORE_MAGIC_FAIL(u, ECORE_MAGIC_CON_URL, __func__); \
return __VA_ARGS__; \
} \
EINA_SAFETY_ON_TRUE_RETURN_VAL(u->delete_me, __VA_ARGS__); \

4
src/lib/ecore_con/efl_net_ssl_conn-openssl.c
View File

@ -195,7 +195,7 @@ struct _Efl_Net_Ssl_Conn
#define EFL_NET_SOCKET_SSL_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5"
#define _efl_net_ssl_conn_session_debug(conn) \
__efl_net_ssl_conn_session_debug(__FILE__, __LINE__, __FUNCTION__, conn)
__efl_net_ssl_conn_session_debug(__FILE__, __LINE__, __func__, conn)
static void
__efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname, Efl_Net_Ssl_Conn *conn)
{
@ -294,7 +294,7 @@ __efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname,
}
#define _efl_net_ssl_conn_check_errors() \
__efl_net_ssl_conn_check_errors(__FILE__, __LINE__, __FUNCTION__)
__efl_net_ssl_conn_check_errors(__FILE__, __LINE__, __func__)
static unsigned long
__efl_net_ssl_conn_check_errors(const char *file, int line, const char *fname)
{

2
src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
View File

@ -17,7 +17,7 @@ struct _Efl_Net_Ssl_Ctx
#define EFL_NET_SSL_CONTEXT_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5"
#define _efl_net_ssl_ctx_check_errors() \
__efl_net_ssl_ctx_check_errors(__FILE__, __LINE__, __FUNCTION__)
__efl_net_ssl_ctx_check_errors(__FILE__, __LINE__, __func__)
static unsigned long
__efl_net_ssl_ctx_check_errors(const char *file, int line, const char *fname)
{

8
src/lib/ecore_evas/ecore_evas.c
View File

@ -44,14 +44,14 @@
#define ECORE_EVAS_CHECK(ee, ...) \
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) \
{ \
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); \
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__); \
return __VA_ARGS__; \
}
#define ECORE_EVAS_CHECK_GOTO(_ee, _label) \
if (!ECORE_MAGIC_CHECK(_ee, ECORE_MAGIC_EVAS)) \
{ \
ECORE_MAGIC_FAIL(_ee, ECORE_MAGIC_EVAS, __FUNCTION__); \
ECORE_MAGIC_FAIL(_ee, ECORE_MAGIC_EVAS, __func__); \
goto _label; \
}
@ -2785,13 +2785,13 @@ ecore_evas_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
EAPI void
ecore_evas_draw_frame_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool draw_frame EINA_UNUSED)
{
WRN("Calling deprecated function %s (not implemented)", __FUNCTION__);
WRN("Calling deprecated function %s (not implemented)", __func__);
}
EAPI Eina_Bool
ecore_evas_draw_frame_get(const Ecore_Evas *ee EINA_UNUSED)
{
WRN("Calling deprecated function %s (not implemented)", __FUNCTION__);
WRN("Calling deprecated function %s (not implemented)", __func__);
return EINA_FALSE;
}

14
src/lib/ecore_evas/ecore_evas_util.c
View File

@ -86,13 +86,13 @@ _ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
static void
_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
{
INF("TODO: %s", __FUNCTION__);
INF("TODO: %s", __func__);
}
static void
_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
{
INF("TODO: %s", __FUNCTION__);
INF("TODO: %s", __func__);
}
static void
@ -227,12 +227,12 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__);
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
return EINA_FALSE;
}
CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE);
if (!_ecore_evas_object_evas_check(__FUNCTION__, ee, obj))
if (!_ecore_evas_object_evas_check(__func__, ee, obj))
return EINA_FALSE;
old_ee = _evas_object_associate_get(obj);
@ -255,7 +255,7 @@ ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__);
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
return EINA_FALSE;
}
@ -284,7 +284,7 @@ ecore_evas_object_associate_get(const Ecore_Evas *ee)
{
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__);
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
return NULL;
}
return _ecore_evas_associate_get(ee);
@ -380,7 +380,7 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__);
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
}
else
{

2
src/lib/ecore_file/ecore_file_download.c
View File

@ -305,7 +305,7 @@ ecore_file_download_abort(Ecore_File_Download_Job *job)
return;
if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB))
{
ECORE_MAGIC_FAIL(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB, __FUNCTION__);
ECORE_MAGIC_FAIL(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB, __func__);
return;
}

4
src/lib/edje/edje_private.h
View File

@ -2757,7 +2757,7 @@ void _edje_lua_shutdown(void);
void __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code);
#define _edje_lua_error(L, err_code) \
__edje_lua_error(__FILE__, __FUNCTION__, __LINE__, L, err_code)
__edje_lua_error(__FILE__, __func__, __LINE__, L, err_code)
Eina_Bool _edje_lua_script_only(Edje *ed);
void _edje_lua_script_only_init(Edje *ed);
@ -2892,7 +2892,7 @@ EAPI void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p);
EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p);
void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code);
#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __FUNCTION__, __LINE__, L, err_code)
#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __func__, __LINE__, L, err_code)
void _edje_lua2_script_init(Edje *ed);
void _edje_lua2_script_shutdown(Edje *ed);
void _edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size);

4
src/lib/efreet/efreet_menu.c
View File

@ -531,7 +531,7 @@ efreet_menu_file_set(const char *file)
EFREET_DEPRECATED_API EAPI void
efreet_menu_async_get(Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
{
ERR("%s is deprecated and shouldn't be called", __FUNCTION__);
ERR("%s is deprecated and shouldn't be called", __func__);
return;
}
@ -575,7 +575,7 @@ efreet_menu_get(void)
EFREET_DEPRECATED_API EAPI void
efreet_menu_async_parse(const char *path EINA_UNUSED, Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
{
ERR("%s is deprecated and shouldn't be called", __FUNCTION__);
ERR("%s is deprecated and shouldn't be called", __func__);
return;
}

4
src/lib/eina/eina_debug_private.h
View File

@ -12,8 +12,8 @@
#define REMOTE_SERVER_PORT 6666
#ifdef DEBUGON
# define e_debug(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "\n", getpid(), __FUNCTION__, __LINE__, ##args)
# define e_debug_begin(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "", getpid(), __FUNCTION__, __LINE__, ##args)
# define e_debug(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "\n", getpid(), __func__, __LINE__, ##args)
# define e_debug_begin(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "", getpid(), __func__, __LINE__, ##args)
# define e_debug_continue(fmt, args...) fprintf(stderr, fmt, ##args)
# define e_debug_end() fprintf(stderr, "\n")
#else

4
src/lib/eina/eina_lock.h
View File

@ -618,7 +618,7 @@ static inline void eina_spinlock_free(Eina_Spinlock *spinlock);
{ \
EINA_LOG_ERR("You are calling %s from outside" \
"of the main loop threads in %s at line %i", \
__FUNCTION__, \
__func__, \
__FILE__, \
__LINE__); \
return val; \
@ -630,7 +630,7 @@ static inline void eina_spinlock_free(Eina_Spinlock *spinlock);
{ \
EINA_LOG_ERR("You are calling %s from outside" \
"of the main loop threads in %s at line %i", \
__FUNCTION__, \
__func__, \
__FILE__, \
__LINE__); \
return ; \

6
src/lib/eina/eina_log.h
View File

@ -142,7 +142,7 @@
* custom data can be passed to that callback, powerful display
* messages can be displayed.
*
* It is suggested to not use __FILE__, __FUNCTION__ or __LINE__ when
* It is suggested to not use __FILE__, __func__ or __LINE__ when
* writing that callback, but when defining macros (like
* EINA_LOG_ERR() and other macros).
*
@ -304,7 +304,7 @@ EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
# define EINA_LOG(DOM, LEVEL, fmt, ...) \
do { \
if (LEVEL <= EINA_LOG_LEVEL_MAXIMUM) { \
eina_log_print(DOM, LEVEL, __FILE__, __FUNCTION__, __LINE__, \
eina_log_print(DOM, LEVEL, __FILE__, __func__, __LINE__, \
fmt, ## __VA_ARGS__); } \
} while (0)
# else
@ -312,7 +312,7 @@ EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
eina_log_print(DOM, \
LEVEL, \
__FILE__, \
__FUNCTION__, \
__func__, \
__LINE__, \
fmt, \
## __VA_ARGS__)

4
src/lib/eina/eina_magic.h
View File

@ -249,7 +249,7 @@ EAPI extern Eina_Error EINA_ERROR_MAGIC_FAILED;
/**
* @def EINA_MAGIC_FAIL(d, m)
* @brief Definition to call eina_magic_fail() with the parameters @p d, @p d->__magic,
* @p m, __FILE__, __FUNCTION__, and __LINE__. @p d must be a structure that
* @p m, __FILE__, __func__, and __LINE__. @p d must be a structure that
* holds an Eina magic number declaration. Use #EINA_MAGIC to add such a
* declaration.
*
@ -261,7 +261,7 @@ EAPI extern Eina_Error EINA_ERROR_MAGIC_FAILED;
(d) ? (d)->__magic : 0, \
(m), \
__FILE__, \
__FUNCTION__, \
__func__, \
__LINE__);
/**

2
src/lib/eina/eina_promise.c
View File

@ -98,7 +98,7 @@
#undef CRI
#define CRI(...) EINA_LOG_DOM_CRIT(_promise_log_dom, __VA_ARGS__)
#define _eina_promise_value_dbg(_msg, _p, _v) __eina_promise_value_dbg(_msg, _p, _v, __LINE__, __FUNCTION__)
#define _eina_promise_value_dbg(_msg, _p, _v) __eina_promise_value_dbg(_msg, _p, _v, __LINE__, __func__)
struct _Eina_Promise {
Eina_Future *future;

22
src/lib/eina/eina_promise.h
View File

@ -1091,7 +1091,7 @@ EAPI Eina_Future *eina_future_then_from_desc(Eina_Future *prev, const Eina_Futur
* fill the following fields:
*
* @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used.
* @li Eina_Future_Cb_Log_Desc::func: The `__FUNCTION__` macro will be used.
* @li Eina_Future_Cb_Log_Desc::func: The `__func__` macro will be used.
* @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used.
* @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used.
* @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used.
@ -1752,7 +1752,7 @@ eina_future_race_array(Eina_Future *array[])
* This macro will set the following fields of the #Eina_Future_Cb_Log_Desc:
*
* @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used.
* @li Eina_Future_Cb_Log_Desc::func: The `__FUNCTION__` macro will be used.
* @li Eina_Future_Cb_Log_Desc::func: The `__func__` macro will be used.
* @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used.
* @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used.
* @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used.
@ -1765,7 +1765,7 @@ eina_future_race_array(Eina_Future *array[])
*/
#define eina_future_cb_log_dbg(_prefix, _suffix) \
eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
__FUNCTION__, EINA_LOG_LEVEL_DBG, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
__func__, EINA_LOG_LEVEL_DBG, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
/**
* A syntactic sugar over eina_future_cb_log_from_desc().
@ -1773,7 +1773,7 @@ eina_future_race_array(Eina_Future *array[])
* This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
*
* @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_CRITICAL will be used.
* @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
* @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@ -1786,7 +1786,7 @@ eina_future_race_array(Eina_Future *array[])
*/
#define eina_future_cb_log_crit(_prefix, _suffix) \
eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
__FUNCTION__, EINA_LOG_LEVEL_CRITICAL, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
__func__, EINA_LOG_LEVEL_CRITICAL, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
/**
* A syntactic sugar over eina_future_cb_log_from_desc().
@ -1794,7 +1794,7 @@ eina_future_race_array(Eina_Future *array[])
* This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
*
* @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_ERR will be used.
* @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
* @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@ -1807,7 +1807,7 @@ eina_future_race_array(Eina_Future *array[])
*/
#define eina_future_cb_log_err(_prefix, _suffix) \
eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
__FUNCTION__, EINA_LOG_LEVEL_ERR, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
__func__, EINA_LOG_LEVEL_ERR, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
/**
* A syntactic sugar over eina_future_cb_log_from_desc().
@ -1815,7 +1815,7 @@ eina_future_race_array(Eina_Future *array[])
* This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
*
* @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_INFO will be used.
* @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
* @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@ -1828,7 +1828,7 @@ eina_future_race_array(Eina_Future *array[])
*/
#define eina_future_cb_log_info(_prefix, _suffix) \
eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
__FUNCTION__, EINA_LOG_LEVEL_INFO, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
__func__, EINA_LOG_LEVEL_INFO, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
/**
* A syntactic sugar over eina_future_cb_log_from_desc().
@ -1836,7 +1836,7 @@ eina_future_race_array(Eina_Future *array[])
* This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
*
* @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
* @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_WARN will be used.
* @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
* @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@ -1852,7 +1852,7 @@ eina_future_race_array(Eina_Future *array[])
*/
#define eina_future_cb_log_warn(_prefix, _suffix) \
eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
__FUNCTION__, EINA_LOG_LEVEL_WARN, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
__func__, EINA_LOG_LEVEL_WARN, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
/**
* A syntactic sugar over eina_future_then() and eina_future_cb_easy().

2
src/lib/eina/eina_safety_checks.h
View File

@ -105,7 +105,7 @@ EAPI extern Eina_Error EINA_ERROR_SAFETY_FAILED;
* @internal
*/
EAPI void _eina_safety_error(const char *file, const char *func, int line, const char *str);
# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __FUNCTION__, __LINE__, msg)
# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __func__, __LINE__, msg)
# else
# define EINA_SAFETY_ERROR(msg) EINA_LOG_ERR("%s", msg)
# endif

18
src/lib/elementary/efl_ui_win.c
View File

@ -1010,13 +1010,13 @@ _elm_win_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
static void
_elm_win_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
{
INF("TODO: %s", __FUNCTION__);
INF("TODO: %s", __func__);
}
static void
_elm_win_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
{
INF("TODO: %s", __FUNCTION__);
INF("TODO: %s", __func__);
}
static void
@ -9160,45 +9160,45 @@ elm_win_available_profiles_set(Elm_Win *obj, const char **profiles, unsigned int
EAPI void
elm_win_fake_canvas_set(Evas_Object *obj EINA_UNUSED, Ecore_Evas *oee EINA_UNUSED)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
}
EAPI void
elm_win_name_set(Evas_Object *obj, const char *name)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
efl_ui_win_name_set(obj, name);
}
EAPI void
elm_win_type_set(Evas_Object *obj, Elm_Win_Type type)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
efl_ui_win_type_set(obj, _elm_win_type_to_efl_ui_win_type(type));
}
EAPI void
elm_win_teamwork_uri_preload(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
}
EAPI void
elm_win_teamwork_uri_show(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
}
EAPI void
elm_win_teamwork_uri_hide(Efl_Ui_Win *obj EINA_UNUSED)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
}
EAPI void
elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
{
ERR("Calling deprecrated function '%s'", __FUNCTION__);
ERR("Calling deprecrated function '%s'", __func__);
}
/* What here follows is code that implements the glue between ecore evas and efl_ui* side */

16
src/lib/elementary/elm_gesture_layer_extra_gestures.c
View File

@ -50,7 +50,7 @@ _tap_long_single_tap_start_cb(void *data, void *event_info)
Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
if (!info->nb_taps_on_single)
{
gl_debug("\n%s\n", __FUNCTION__);
gl_debug("\n%s\n", __func__);
_cb_call(info, ELM_GESTURE_STATE_START, event_info);
}
return flags;
@ -63,7 +63,7 @@ _tap_long_single_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
if (!info->long_tap_started)
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
_cb_call(info, ELM_GESTURE_STATE_ABORT, NULL);
info->nb_taps_on_single = 0;
}
@ -73,7 +73,7 @@ _tap_long_single_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
static Eina_Bool
_tap_long_timeout(void *data)
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
Tap_Longpress_Info *info = data;
_tap_long_single_tap_abort_cb(info, NULL);
info->timer_between_taps = NULL;
@ -83,7 +83,7 @@ _tap_long_timeout(void *data)
static Evas_Event_Flags
_tap_long_single_tap_end_cb(void *data, void *event_info)
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
Tap_Longpress_Info *info = data;
Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
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)
Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
if (info->nb_taps_on_single && info->timer_between_taps)
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
info->long_tap_started = EINA_TRUE;
ecore_timer_del(info->timer_between_taps);
info->timer_between_taps = NULL;
@ -115,7 +115,7 @@ _tap_long_long_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
if (info->long_tap_started)
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
_cb_call(info, ELM_GESTURE_STATE_ABORT, NULL);
info->nb_taps_on_single = 0;
info->long_tap_started = EINA_FALSE;
@ -136,7 +136,7 @@ _tap_long_long_tap_move_cb(void *data, void *event_info)
}
else
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
_cb_call(info, ELM_GESTURE_STATE_MOVE, event_info);
}
}
@ -150,7 +150,7 @@ _tap_long_long_tap_end_cb(void *data, void *event_info)
Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
if (info->long_tap_started)
{
gl_debug("%s\n", __FUNCTION__);
gl_debug("%s\n", __func__);
_cb_call(info, ELM_GESTURE_STATE_END, event_info);
info->long_tap_started = EINA_FALSE;
info->nb_taps_on_single = 0;

2
src/lib/embryo/embryo_main.c
View File

@ -52,7 +52,7 @@ embryo_shutdown(void)
{
if (_embryo_init_count <= 0)
{
printf("%s:%i Init count not greater than 0 in shutdown.", __FUNCTION__, __LINE__);
printf("%s:%i Init count not greater than 0 in shutdown.", __func__, __LINE__);
return 0;
}
if (--_embryo_init_count != 0)

10
src/lib/eo/eo.c
View File

@ -989,7 +989,7 @@ err_vtable:
static Eo *
_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)
{
const char *func_name = __FUNCTION__;
const char *func_name = __func__;
_Eo_Object *obj;
Eo_Stack_Frame *fptr = NULL;
@ -1981,7 +1981,7 @@ efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
efl_ref(obj_id);
#ifdef EO_DEBUG
const char *func_name = __FUNCTION__;
const char *func_name = __func__;
EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, obj_id);
Eo_Xref_Node *xref = calloc(1, sizeof(*xref));
@ -2092,7 +2092,7 @@ efl_unref(const Eo *obj_id)
{
ERR("Obj:%s@%p. User refcount (%d) < 0. Too many unrefs.",
obj->klass->desc->name, obj_id, obj->user_refcount);
_eo_log_obj_report((Eo_Id)obj_id, EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__);
_eo_log_obj_report((Eo_Id)obj_id, EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
EO_OBJ_DONE(obj_id);
_efl_unref(obj);
return;
@ -2336,7 +2336,7 @@ efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_C
{
void *ret = NULL;
_Efl_Class *klass = NULL;
const char *func_name = __FUNCTION__;
const char *func_name = __func__;
EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, NULL);
EO_OBJ_POINTER_PROXY(ref_obj_id, ref_obj);
if (ref_obj)
@ -3476,7 +3476,7 @@ _eo_log_obj_shutdown(void)
entry->klass,
entry->klass->desc->name,
entry->timestamp - _eo_log_time_start, now - entry->timestamp);
_eo_log_obj_entry_show(entry, EINA_LOG_LEVEL_DBG, __FUNCTION__, __FILE__, __LINE__, now);
_eo_log_obj_entry_show(entry, EINA_LOG_LEVEL_DBG, __func__, __FILE__, __LINE__, now);
leaks++;
}
}

10
src/lib/eo/eo_private.h
View File

@ -323,7 +323,7 @@ _efl_ref(_Eo_Object *obj)
return obj;
}
#define _efl_unref(obj) _efl_unref_internal(obj, __FUNCTION__, __FILE__, __LINE__)
#define _efl_unref(obj) _efl_unref_internal(obj, __func__, __FILE__, __LINE__)
static inline void
_efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, int line)
{
@ -333,27 +333,27 @@ _efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, in
if (obj->user_refcount > 0)
{
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);
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__);
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
return;
}
if (obj->refcount < 0)
{
ERR("in %s:%d: func '%s' Obj:%p. Refcount (%d) < 0. Too many unrefs.", file, line, func_name, obj, obj->refcount);
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__);
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
return;
}
if (obj->destructed)
{
ERR("in %s:%d: func '%s' Object %p already destructed.", file, line, func_name, _eo_obj_id_get(obj));
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__);
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
return;
}
if (obj->del_triggered)
{
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));
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__);
_eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
return;
}

10
src/lib/eo/eo_ptr_indirection.h
View File

@ -9,12 +9,12 @@
void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file, int line, const char *fmt, ...);
#define _EO_POINTER_ERR(obj_id, fmt, ...) \
_eo_pointer_error(obj_id, __FUNCTION__, __FILE__, __LINE__, fmt, __VA_ARGS__)
_eo_pointer_error(obj_id, __func__, __FILE__, __LINE__, fmt, __VA_ARGS__)
#define EO_OBJ_POINTER(obj_id, obj) \
_Eo_Object *obj; \
do { \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
} while (0)
#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
#define EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, ret) \
_Eo_Object *obj; \
do { \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
if (!obj) return (ret); \
} while (0)
@ -41,7 +41,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
#define EO_OBJ_POINTER_RETURN(obj_id, obj) \
_Eo_Object *obj; \
do { \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
if (!obj) return; \
} while (0)
@ -55,7 +55,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
#define EO_OBJ_POINTER_GOTO(obj_id, obj, label) \
_Eo_Object *obj; \
do { \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \
obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
if (!obj) goto label; \
} while (0)

2
src/lib/evas/canvas/evas_callbacks.c
View File

@ -731,7 +731,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
if (e->delete_me) return;
if (e->current_event == EVAS_CALLBACK_LAST)
{
ERR("%s() can only be called from an input event callback!", __FUNCTION__);
ERR("%s() can only be called from an input event callback!", __func__);
return;
}
EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );

4
src/lib/evas/canvas/evas_image_legacy.c
View File

@ -1122,7 +1122,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace)
static int warned = 0;
if (!warned)
{
ERR("%s is deprecated and shouldn't be called", __FUNCTION__);
ERR("%s is deprecated and shouldn't be called", __func__);
warned = 1;
}
@ -1198,7 +1198,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p
static int warned = 0;
if (!warned)
{
ERR("%s is deprecated and shouldn't be called", __FUNCTION__);
ERR("%s is deprecated and shouldn't be called", __func__);
warned = 1;
}

2
src/lib/evas/canvas/evas_object_main.c
View File

@ -933,7 +933,7 @@ evas_object_del(Evas_Object *obj)
if (!efl_isa(obj, MY_CLASS))
{
ERR("Called %s on a non-evas object: %s@%p",
__FUNCTION__, efl_class_name_get(obj), obj);
__func__, efl_class_name_get(obj), obj);
return;
}
pd = efl_data_scope_get(obj, MY_CLASS);

2
src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
View File

@ -9,7 +9,7 @@
do { \
static int _foo = 0; \
if (_foo++%10000 ==0) \
printf("%s %+d %s: %d (%s)\n",__FILE__,__LINE__,__FUNCTION__,\
printf("%s %+d %s: %d (%s)\n",__FILE__,__LINE__,__func__,\
_foo, x " optimised");\
} while (0)
#else

4
src/lib/evas/filters/evas_filter_parser.c
View File

@ -594,7 +594,7 @@ _bool_parse(const char *str, Eina_Bool *b)
#define PARSE_ABORT() do {} while (0)
//#define PARSE_ABORT() abort()
#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)
#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)
/* Buffers */
static Buffer *
@ -1924,7 +1924,7 @@ _padding_set_instruction_prepare(Evas_Filter_Program *pgm EINA_UNUSED,
/* Evas_Filter_Parser entry points */
#undef PARSE_CHECK
#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)
#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)
EAPI void
evas_filter_program_del(Evas_Filter_Program *pgm)

16
src/lib/evil/evil_util.c
View File

@ -29,7 +29,7 @@ evil_char_to_wchar(const char *text)
(wsize > (int)(ULONG_MAX / sizeof(wchar_t))))
{
if (wsize == 0)
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -37,7 +37,7 @@ evil_char_to_wchar(const char *text)
if (wtext)
if (!MultiByteToWideChar(CP_ACP, 0, text, (int)strlen(text) + 1, wtext, wsize))
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -56,7 +56,7 @@ evil_wchar_to_char(const wchar_t *text)
asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL);
if (asize == 0)
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -67,7 +67,7 @@ evil_wchar_to_char(const wchar_t *text)
asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL);
if (asize == 0)
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -89,7 +89,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL);
if (size8 == 0)
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -100,7 +100,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, text8, size8, NULL, NULL);
if (size8 == 0)
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -120,7 +120,7 @@ evil_utf8_to_utf16(const char *text)
size16 = MultiByteToWideChar(CP_UTF8, flag, text, -1, NULL, 0);
if (size16 == 0)
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}
@ -128,7 +128,7 @@ evil_utf8_to_utf16(const char *text)
if (text16)
if (!MultiByteToWideChar(CP_UTF8, flag, text, -1, text16, size16))
{
_evil_last_error_display(__FUNCTION__);
_evil_last_error_display(__func__);
return NULL;
}

14
src/modules/ecore_imf/ibus/ibus_imcontext.c
View File

@ -287,7 +287,7 @@ _request_surrounding_text(IBusIMContext *ibusimcontext)
IBusIMContext *
ecore_imf_context_ibus_new(void)
{
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
IBusIMContext *context = calloc(1, sizeof(IBusIMContext));
@ -320,7 +320,7 @@ ecore_imf_context_ibus_shutdown(void)
void
ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx)
{
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
char *s = NULL;
IBusIMContext *ibusimcontext = (IBusIMContext *)ecore_imf_context_data_get(ctx);
@ -358,7 +358,7 @@ ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx)
void
ecore_imf_context_ibus_del(Ecore_IMF_Context *ctx)
{
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
IBusIMContext *ibusimcontext = (IBusIMContext*)ecore_imf_context_data_get(ctx);
Ecore_IMF_Preedit_Attr *attr = NULL;
@ -401,7 +401,7 @@ ecore_imf_context_ibus_filter_event(Ecore_IMF_Context *ctx,
if (type != ECORE_IMF_EVENT_KEY_UP && type != ECORE_IMF_EVENT_KEY_DOWN)
return EINA_FALSE;
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
if (G_LIKELY(ibusimcontext->ibuscontext && ibusimcontext->has_focus))
{
@ -979,7 +979,7 @@ static void
_ecore_imf_context_ibus_hide_preedit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED,
IBusIMContext *ibusimcontext)
{
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
EINA_SAFETY_ON_NULL_RETURN(ibusimcontext);
if (ibusimcontext->preedit_visible == EINA_FALSE)
@ -1002,7 +1002,7 @@ static void
_ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED,
IBusIMContext *ibusimcontext)
{
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
EINA_SAFETY_ON_NULL_RETURN(ibusimcontext);
g_object_unref(ibusimcontext->ibuscontext);
@ -1028,7 +1028,7 @@ _ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED,
static void
_ecore_imf_context_ibus_create(IBusIMContext *ibusimcontext)
{
EINA_LOG_DBG("%s", __FUNCTION__);
EINA_LOG_DBG("%s", __func__);
EINA_SAFETY_ON_NULL_RETURN(ibusimcontext);
ibusimcontext->ibuscontext = ibus_bus_create_input_context(_bus, "ecore");

158
src/modules/ecore_imf/scim/scim_imcontext.cpp
View File

@ -471,12 +471,12 @@ _ecore_imf_lock_to_scim_mask(unsigned int locks)
EcoreIMFContextISF *
isf_imf_context_new(void)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = new EcoreIMFContextISF;
if (context_scim == NULL)
{
std::cerr << "memory allocation failed in " << __FUNCTION__ << "\n";
std::cerr << "memory allocation failed in " << __func__ << "\n";
return NULL;
}
@ -500,7 +500,7 @@ isf_imf_context_new(void)
void
isf_imf_context_shutdown(void)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
if (_scim_initialized)
{
@ -512,7 +512,7 @@ isf_imf_context_shutdown(void)
void
isf_imf_context_add(Ecore_IMF_Context *ctx)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -554,7 +554,7 @@ isf_imf_context_add(Ecore_IMF_Context *ctx)
context_scim->impl = new_ic_impl(context_scim);
if (context_scim->impl == NULL)
{
std::cerr << "memory allocation failed in " << __FUNCTION__ << "\n";
std::cerr << "memory allocation failed in " << __func__ << "\n";
return;
}
@ -592,7 +592,7 @@ isf_imf_context_add(Ecore_IMF_Context *ctx)
void
isf_imf_context_del(Ecore_IMF_Context *ctx)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
if (!_ic_list) return;
@ -669,7 +669,7 @@ isf_imf_context_del(Ecore_IMF_Context *ctx)
void
isf_imf_context_client_canvas_set(Ecore_IMF_Context *ctx, void *canvas)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -695,7 +695,7 @@ isf_imf_context_client_canvas_set(Ecore_IMF_Context *ctx, void *canvas)
void
isf_imf_context_client_window_set(Ecore_IMF_Context *ctx, void *window)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -724,7 +724,7 @@ isf_imf_context_client_window_set(Ecore_IMF_Context *ctx, void *window)
void
isf_imf_context_reset(Ecore_IMF_Context *ctx)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -755,7 +755,7 @@ isf_imf_context_focus_in(Ecore_IMF_Context *ctx)
EINA_SAFETY_ON_NULL_RETURN(context_scim);
EINA_SAFETY_ON_NULL_RETURN(context_scim->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__<< "(" << context_scim->id << ")...\n";
SCIM_DEBUG_FRONTEND(1) << __func__<< "(" << context_scim->id << ")...\n";
if (_focused_ic)
{
@ -866,7 +866,7 @@ isf_imf_context_focus_out(Ecore_IMF_Context *ctx)
EINA_SAFETY_ON_NULL_RETURN(context_scim);
EINA_SAFETY_ON_NULL_RETURN(context_scim->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "(" << context_scim->id << ")...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "(" << context_scim->id << ")...\n";
if (context_scim == _focused_ic)
{
@ -900,7 +900,7 @@ isf_imf_context_focus_out(Ecore_IMF_Context *ctx)
void
isf_imf_context_cursor_location_set(Ecore_IMF_Context *ctx, int cx, int cy, int cw, int ch)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -964,7 +964,7 @@ isf_imf_context_cursor_location_set(Ecore_IMF_Context *ctx, int cx, int cy, int
void
isf_imf_context_use_preedit_set(Ecore_IMF_Context* ctx, Eina_Bool use_preedit)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " = " << (use_preedit ? "true" : "false") << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " = " << (use_preedit ? "true" : "false") << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -991,7 +991,7 @@ isf_imf_context_use_preedit_set(Ecore_IMF_Context* ctx, Eina_Bool use_preedit)
void
isf_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char** str, Eina_List **attrs, int *cursor_pos)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1140,7 +1140,7 @@ isf_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char*
void
isf_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char** str, int *cursor_pos)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1183,7 +1183,7 @@ isf_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char** str, int *curs
void
isf_imf_context_cursor_position_set(Ecore_IMF_Context *ctx, int cursor_pos)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1213,7 +1213,7 @@ isf_imf_context_cursor_position_set(Ecore_IMF_Context *ctx, int cursor_pos)
void
isf_imf_context_input_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode input_mode)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1234,7 +1234,7 @@ isf_imf_context_input_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode inpu
void
isf_imf_context_prediction_allow_set(Ecore_IMF_Context* ctx, Eina_Bool prediction)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " = " << (prediction ? "true" : "false") << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " = " << (prediction ? "true" : "false") << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1247,7 +1247,7 @@ isf_imf_context_prediction_allow_set(Ecore_IMF_Context* ctx, Eina_Bool predictio
void
isf_imf_context_autocapital_type_set(Ecore_IMF_Context* ctx, Ecore_IMF_Autocapital_Type autocapital_type)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " = " << autocapital_type << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " = " << autocapital_type << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1275,7 +1275,7 @@ isf_imf_context_autocapital_type_set(Ecore_IMF_Context* ctx, Ecore_IMF_Autocapit
Eina_Bool
isf_imf_context_filter_event(Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, Ecore_IMF_Event *event)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN_VAL(ic, EINA_FALSE);
@ -1324,7 +1324,7 @@ isf_imf_context_filter_event(Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type,
void
isf_imf_context_input_panel_show(Ecore_IMF_Context *ctx)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1338,7 +1338,7 @@ isf_imf_context_input_panel_show(Ecore_IMF_Context *ctx)
void
isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
EINA_SAFETY_ON_NULL_RETURN(context_scim);
@ -1353,14 +1353,14 @@ isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
static void
panel_slot_reload_config(int context EINA_UNUSED)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
_config->reload();
}
static void
panel_slot_exit(int /* context */)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
finalize();
}
@ -1372,7 +1372,7 @@ panel_slot_update_lookup_table_page_size(int context, int page_size)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " page_size=" << page_size << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " page_size=" << page_size << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
ic->impl->si->update_lookup_table_page_size(page_size);
@ -1386,7 +1386,7 @@ panel_slot_lookup_table_page_up(int context)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
ic->impl->si->lookup_table_page_up();
@ -1400,7 +1400,7 @@ panel_slot_lookup_table_page_down(int context)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
ic->impl->si->lookup_table_page_down();
@ -1414,7 +1414,7 @@ panel_slot_trigger_property(int context, const String &property)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " property=" << property << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " property=" << property << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
ic->impl->si->trigger_property(property);
@ -1428,7 +1428,7 @@ panel_slot_process_helper_event(int context, const String &target_uuid, const St
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " target=" << target_uuid
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " target=" << target_uuid
<< " helper=" << helper_uuid << " ic=" << ic << " ic->impl=" << ic->impl << " ic-uuid="
<< (ic->impl ? ic->impl->si->get_factory_uuid() : "" ) << "\n";
@ -1448,7 +1448,7 @@ panel_slot_move_preedit_caret(int context, int caret_pos)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " caret=" << caret_pos << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " caret=" << caret_pos << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
ic->impl->si->move_preedit_caret(caret_pos);
@ -1462,7 +1462,7 @@ panel_slot_select_candidate(int context, int cand_index)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " candidate=" << cand_index << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " candidate=" << cand_index << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
ic->impl->si->select_candidate(cand_index);
@ -1473,7 +1473,7 @@ static void
panel_slot_process_key_event(int context, const KeyEvent &key)
{
EcoreIMFContextISF *ic = find_ic(context);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n";
if (!ecore_x_display_get()) return;
if (key.is_key_press())
@ -1486,7 +1486,7 @@ panel_slot_commit_string(int context, const WideString &wstr)
EcoreIMFContextISF *ic = find_ic(context);
EINA_SAFETY_ON_NULL_RETURN(ic);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " str=" << utf8_wcstombs(wstr) << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " str=" << utf8_wcstombs(wstr) << " ic=" << ic << "\n";
if (_focused_ic != ic)
return;
@ -1501,7 +1501,7 @@ panel_slot_forward_key_event(int context, const KeyEvent &key)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n";
if (ic->impl->client_canvas)
feed_key_event(ic->impl->client_canvas, key.get_key_string().c_str(), EINA_TRUE);
@ -1513,7 +1513,7 @@ panel_slot_request_help(int context)
EcoreIMFContextISF *ic = find_ic(context);
EINA_SAFETY_ON_NULL_RETURN(ic);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
panel_req_show_help(ic);
@ -1526,7 +1526,7 @@ panel_slot_request_factory_menu(int context)
EcoreIMFContextISF *ic = find_ic(context);
EINA_SAFETY_ON_NULL_RETURN(ic);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
_panel_client.prepare(ic->id);
panel_req_show_factory_menu(ic);
@ -1540,7 +1540,7 @@ panel_slot_change_factory(int context, const String &uuid)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " factory=" << uuid << " ic=" << ic << "\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " factory=" << uuid << " ic=" << ic << "\n";
ic->impl->si->reset();
_panel_client.prepare(ic->id);
@ -1552,7 +1552,7 @@ panel_slot_change_factory(int context, const String &uuid)
static void
panel_req_show_help(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@ -1580,7 +1580,7 @@ panel_req_show_help(EcoreIMFContextISF *ic)
static void
panel_req_show_factory_menu(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
std::vector<IMEngineFactoryPointer> factories;
std::vector <PanelFactoryInfo> menu;
@ -1603,7 +1603,7 @@ panel_req_show_factory_menu(EcoreIMFContextISF *ic)
static void
panel_req_update_factory_info(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@ -1628,7 +1628,7 @@ panel_req_update_factory_info(EcoreIMFContextISF *ic)
static void
panel_req_focus_in(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
_panel_client.focus_in(ic->id, ic->impl->si->get_factory_uuid());
}
@ -1636,7 +1636,7 @@ panel_req_focus_in(EcoreIMFContextISF *ic)
static void
panel_req_update_spot_location(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
_panel_client.update_spot_location(ic->id, ic->impl->cursor_x, ic->impl->cursor_y);
}
@ -1644,7 +1644,7 @@ panel_req_update_spot_location(EcoreIMFContextISF *ic)
static bool
filter_hotkeys(EcoreIMFContextISF *ic, const KeyEvent &key)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
bool ret = false;
@ -1700,7 +1700,7 @@ filter_hotkeys(EcoreIMFContextISF *ic, const KeyEvent &key)
static bool
panel_initialize(void)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
String display_name;
{
@ -1725,7 +1725,7 @@ panel_initialize(void)
static void
panel_finalize(void)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
_panel_client.close_connection();
@ -1745,7 +1745,7 @@ panel_finalize(void)
static Eina_Bool
panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
if (fd_handler == _panel_iochannel_read_handler)
{
@ -1768,7 +1768,7 @@ panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
static void
turn_on_ic(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@ -1805,7 +1805,7 @@ turn_on_ic(EcoreIMFContextISF *ic)
static void
turn_off_ic(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@ -1838,7 +1838,7 @@ turn_off_ic(EcoreIMFContextISF *ic)
static void
set_ic_capabilities(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@ -1854,7 +1854,7 @@ set_ic_capabilities(EcoreIMFContextISF *ic)
static bool
check_socket_frontend(void)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
SocketAddress address;
SocketClient client;
@ -2048,7 +2048,7 @@ finalize(void)
static void
open_next_factory(EcoreIMFContextISF *ic)
{
SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n";
SCIM_DEBUG_FRONTEND(2) << __func__ << " context=" << ic->id << "\n";
IMEngineFactoryPointer sf = _backend->get_next_factory("", "UTF-8", ic->impl->si->get_factory_uuid());
if (!sf.null())
@ -2078,7 +2078,7 @@ open_previous_factory(EcoreIMFContextISF *ic)
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n";
SCIM_DEBUG_FRONTEND(2) << __func__ << " context=" << ic->id << "\n";
IMEngineFactoryPointer sf = _backend->get_previous_factory("", "UTF-8", ic->impl->si->get_factory_uuid());
if (!sf.null())
@ -2109,7 +2109,7 @@ open_specific_factory(EcoreIMFContextISF *ic,
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n";
SCIM_DEBUG_FRONTEND(2) << __func__ << " context=" << ic->id << "\n";
// The same input method is selected, just turn on the IC.
if (ic->impl->si->get_factory_uuid() == uuid)
@ -2171,7 +2171,7 @@ open_specific_factory(EcoreIMFContextISF *ic,
static void initialize_modifier_bits(Display *display)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
if (__current_display == display)
return;
@ -2270,7 +2270,7 @@ static void initialize_modifier_bits(Display *display)
static unsigned int scim_x11_keymask_scim_to_x11(Display *display, uint16 scimkeymask)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
unsigned int state = 0;
@ -2292,7 +2292,7 @@ static XKeyEvent createKeyEvent(Display *display, Window &win,
Window &winRoot, bool press,
int keysym, int modifiers)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
XKeyEvent event;
@ -2320,7 +2320,7 @@ static XKeyEvent createKeyEvent(Display *display, Window &win,
static void _x_send_key_event(const KeyEvent &key)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
// Obtain the X11 display.
Display *display = (Display *)ecore_x_display_get();
@ -2410,7 +2410,7 @@ attach_instance(const IMEngineInstancePointer &si)
static void
slot_show_preedit_string(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2434,7 +2434,7 @@ slot_show_preedit_string(IMEngineInstanceBase *si)
static void
slot_show_aux_string(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2446,7 +2446,7 @@ slot_show_aux_string(IMEngineInstanceBase *si)
static void
slot_show_lookup_table(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2458,7 +2458,7 @@ slot_show_lookup_table(IMEngineInstanceBase *si)
static void
slot_hide_preedit_string(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2494,7 +2494,7 @@ slot_hide_preedit_string(IMEngineInstanceBase *si)
static void
slot_hide_aux_string(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2506,7 +2506,7 @@ slot_hide_aux_string(IMEngineInstanceBase *si)
static void
slot_hide_lookup_table(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2518,7 +2518,7 @@ slot_hide_lookup_table(IMEngineInstanceBase *si)
static void
slot_update_preedit_caret(IMEngineInstanceBase *si, int caret)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2546,7 +2546,7 @@ slot_update_preedit_string(IMEngineInstanceBase *si,
const WideString & str,
const AttributeList & attrs)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2580,7 +2580,7 @@ slot_update_aux_string(IMEngineInstanceBase *si,
const WideString & str,
const AttributeList & attrs)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2593,7 +2593,7 @@ static void
slot_commit_string(IMEngineInstanceBase *si,
const WideString & str)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2606,7 +2606,7 @@ static void
slot_forward_key_event(IMEngineInstanceBase *si,
const KeyEvent & key)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2622,7 +2622,7 @@ static void
slot_update_lookup_table(IMEngineInstanceBase *si,
const LookupTable & table)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2635,7 +2635,7 @@ static void
slot_register_properties(IMEngineInstanceBase *si,
const PropertyList & properties)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2648,7 +2648,7 @@ static void
slot_update_property(IMEngineInstanceBase *si,
const Property & property)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2660,7 +2660,7 @@ slot_update_property(IMEngineInstanceBase *si,
static void
slot_beep(IMEngineInstanceBase *si)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
@ -2678,7 +2678,7 @@ slot_start_helper(IMEngineInstanceBase *si,
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " helper= " << helper_uuid << " context="
SCIM_DEBUG_FRONTEND(1) << __func__ << " helper= " << helper_uuid << " context="
<< ic->id << " ic=" << ic
<< " ic-uuid=" << ic->impl->si->get_factory_uuid() << "...\n";
@ -2692,7 +2692,7 @@ slot_stop_helper(IMEngineInstanceBase *si,
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN(ic);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " helper= " << helper_uuid << " context=" << ic->id << " ic=" << ic << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << " helper= " << helper_uuid << " context=" << ic->id << " ic=" << ic << "...\n";
_panel_client.stop_helper(ic->id, helper_uuid);
}
@ -2706,7 +2706,7 @@ slot_send_helper_event(IMEngineInstanceBase *si,
EINA_SAFETY_ON_NULL_RETURN(ic);
EINA_SAFETY_ON_NULL_RETURN(ic->impl);
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " helper= " << helper_uuid << " context="
SCIM_DEBUG_FRONTEND(1) << __func__ << " helper= " << helper_uuid << " context="
<< ic->id << " ic=" << ic
<< " ic-uuid=" << ic->impl->si->get_factory_uuid() << "...\n";
@ -2720,7 +2720,7 @@ slot_get_surrounding_text(IMEngineInstanceBase *si,
int maxlen_before,
int maxlen_after)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN_VAL(ic, false);
@ -2770,7 +2770,7 @@ slot_delete_surrounding_text(IMEngineInstanceBase *si,
int offset,
int len)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
EINA_SAFETY_ON_NULL_RETURN_VAL(ic, false);
@ -2790,7 +2790,7 @@ slot_delete_surrounding_text(IMEngineInstanceBase *si,
static void
reload_config_callback(const ConfigPointer &config)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
_frontend_hotkey_matcher.load_hotkeys(config);
_imengine_hotkey_matcher.load_hotkeys(config);
@ -2820,7 +2820,7 @@ static void
fallback_commit_string_cb(IMEngineInstanceBase *si EINA_UNUSED,
const WideString &str)
{
SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
if (_focused_ic)
{

4
src/modules/evas/engines/gl_common/evas_gl_api.c
View File

@ -11,10 +11,10 @@
#define EVGLD_FUNC_BEGIN() \
{ \
EVGL_FUNC_BEGIN(); \
_func_begin_debug(__FUNCTION__); \
_func_begin_debug(__func__); \
}
#define EVGLD_FUNC_END() GLERRV(__FUNCTION__)
#define EVGLD_FUNC_END() GLERRV(__func__)
#define _EVGL_INT_INIT_VALUE -3
#define SET_GL_ERROR(gl_error_type) \

2
src/modules/evas/engines/gl_common/evas_gl_api_ext.c
View File

@ -122,7 +122,7 @@ struct wl_resource;
// Evas extensions from EGL extensions
#ifdef GL_GLES
#define EGLDISPLAY_GET(a) _evgl_egl_display_get(__FUNCTION__, a)
#define EGLDISPLAY_GET(a) _evgl_egl_display_get(__func__, a)
// this struct defines an EvasGLImage when using EGL
typedef struct _EvasGLImage {

4
src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
View File

@ -9,10 +9,10 @@
#define EVGLD_FUNC_BEGIN() \
{ \
_func_begin_debug(__FUNCTION__); \
_func_begin_debug(__func__); \
}
#define EVGLD_FUNC_END() GLERRV(__FUNCTION__)
#define EVGLD_FUNC_END() GLERRV(__func__)
static void *_gles1_handle = NULL;
static Evas_GL_API _gles1_api;

2
src/modules/evas/engines/gl_common/evas_gl_common.h
View File

@ -872,7 +872,7 @@ __evas_gl_errdyn(int err, const char *file, const char *func, int line, const ch
# define GLERRV(op) do { \
int __gl_err = glGetError(); \
if (__gl_err != GL_NO_ERROR) \
__evas_gl_errdyn(__gl_err, __FILE__, __FUNCTION__, __LINE__, op); \
__evas_gl_errdyn(__gl_err, __FILE__, __func__, __LINE__, op); \
} while (0)
/* Redefine common gl funcs */
# ifndef GL_ERRORS_NODEF

2
src/modules/evas/engines/gl_common/evas_gl_texture.c
View File

@ -1378,7 +1378,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
err = glGetError();
if (err != GL_NO_ERROR)
{
__evas_gl_err(err, __FILE__, __FUNCTION__, __LINE__,
__evas_gl_err(err, __FILE__, __func__, __LINE__,
"glCompressedTexSubImage2D");
// FIXME: Changing settings on the fly.

2
src/modules/evas/image_loaders/dds/evas_image_load_dds.c
View File

@ -157,7 +157,7 @@ _dword_read(const char **m)
return val;
}
#define FAIL() do { /*fprintf(stderr, "DDS: ERROR at %s:%d\n", __FUNCTION__, __LINE__);*/ goto on_error; } while (0)
#define FAIL() do { /*fprintf(stderr, "DDS: ERROR at %s:%d\n", __func__, __LINE__);*/ goto on_error; } while (0)
static Eina_Bool
evas_image_load_file_head_dds(void *loader_data,

2
src/static_libs/rg_etc/etc2_encoder.c
View File

@ -146,7 +146,7 @@ absi(int a)
#ifndef DBG
# ifdef DEBUG
# define DBG(fmt, ...) fprintf(stderr, "%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## __VA_ARGS__)
# define DBG(fmt, ...) fprintf(stderr, "%s:%d: " fmt "\n", __func__, __LINE__, ## __VA_ARGS__)
# else
# define DBG(...)
# endif

4
src/static_libs/rg_etc/rg_etc1.c
View File

@ -2278,7 +2278,7 @@ rg_etc1_pack_block_solid_color(unsigned char *block, const color_quad_u8 *color,
if (!rg_etc1_inverse_lookup[0][255])
{
fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __FUNCTION__);
fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __func__);
return 0;
}
@ -2392,7 +2392,7 @@ rg_etc1_pack_block_solid_color_constrained(rg_etc1_optimizer_results *results,ui
if (!rg_etc1_inverse_lookup[0][255])
{
fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __FUNCTION__);
fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __func__);
return 0;
}

10
src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
View File

@ -499,7 +499,7 @@ th61_do(void *data EINA_UNUSED, Ecore_Thread *th)
}
eina_semaphore_release(&th6_sem, 1);
if (DEBUG) printf("%s: message sending done!\n", __FUNCTION__);
if (DEBUG) printf("%s: message sending done!\n", __func__);
}
static void
@ -515,7 +515,7 @@ th62_do(void *data EINA_UNUSED, Ecore_Thread *th)
msg = eina_thread_queue_wait(thq1, &ref);
fail_if(!msg);
if (DEBUG) printf("%s: v %08i: %i [%i]\n", __FUNCTION__, cnt, msg->value, eina_thread_queue_pending_get(thq1));
if (DEBUG) printf("%s: v %08i: %i [%i]\n", __func__, cnt, msg->value, eina_thread_queue_pending_get(thq1));
val = msg->value;
eina_thread_queue_wait_done(thq1, ref);
if (val == EXIT_MESSAGE || (ecore_thread_check(th))) break;
@ -529,7 +529,7 @@ th62_do(void *data EINA_UNUSED, Ecore_Thread *th)
ck_assert_int_eq(msgnum, 100);
eina_spinlock_release(&msgnum_lock);
eina_semaphore_release(&th6_sem, 1);
if (DEBUG) printf("%s: message reading done!\n", __FUNCTION__);
if (DEBUG) printf("%s: message reading done!\n", __func__);
}
static void
@ -545,7 +545,7 @@ th63_do(void *data EINA_UNUSED, Ecore_Thread *th)
msg = eina_thread_queue_wait(thq1, &ref);
fail_if(!msg);
if (DEBUG) printf("%s: v %08i: %i [%i]\n", __FUNCTION__, cnt, msg->value, eina_thread_queue_pending_get(thq1));
if (DEBUG) printf("%s: v %08i: %i [%i]\n", __func__, cnt, msg->value, eina_thread_queue_pending_get(thq1));
val = msg->value;
eina_thread_queue_wait_done(thq1, ref);
if (val == EXIT_MESSAGE || (ecore_thread_check(th))) break;
@ -559,7 +559,7 @@ th63_do(void *data EINA_UNUSED, Ecore_Thread *th)
ck_assert_int_eq(msgnum, 100);
eina_spinlock_release(&msgnum_lock);
eina_semaphore_release(&th6_sem, 1);
if (DEBUG) printf("%s: message reading done!\n", __FUNCTION__);
if (DEBUG) printf("%s: message reading done!\n", __func__);
}
EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6)

10
src/tests/ecore/efl_app_test_promise.c
View File

@ -1103,19 +1103,19 @@ EFL_START_TEST(efl_test_promise_log)
fail_if(domain < 0);
eina_log_domain_level_set(PROMISE_LOG_DOMAIN_STR, EINA_LOG_LEVEL_DBG);
ctx.dbg = (Eina_Future_Cb_Log_Desc){"dbg prefix:", " dbg suffix", __FILE__,
__FUNCTION__, EINA_LOG_LEVEL_DBG,
__func__, EINA_LOG_LEVEL_DBG,
domain, __LINE__};
ctx.crit = (Eina_Future_Cb_Log_Desc){NULL, NULL, __FILE__,
__FUNCTION__, EINA_LOG_LEVEL_CRITICAL,
__func__, EINA_LOG_LEVEL_CRITICAL,
domain, __LINE__};
ctx.warn = (Eina_Future_Cb_Log_Desc){"warn prefix:", NULL, __FILE__,
__FUNCTION__, EINA_LOG_LEVEL_WARN,
__func__, EINA_LOG_LEVEL_WARN,
domain, __LINE__};
ctx.err = (Eina_Future_Cb_Log_Desc){NULL, " err suffix", __FILE__,
__FUNCTION__, EINA_LOG_LEVEL_ERR,
__func__, EINA_LOG_LEVEL_ERR,
domain, __LINE__};
ctx.info = (Eina_Future_Cb_Log_Desc){"info prefix:", " info suffix",
__FILE__, __FUNCTION__, EINA_LOG_LEVEL_INFO,
__FILE__, __func__, EINA_LOG_LEVEL_INFO,
domain, __LINE__};
eina_log_print_cb_set(_log_test, &ctx);
f = eina_future_chain(_int_future_get(),

4
src/tests/efl_mono/libefl_mono_native_test.h
View File

@ -75,7 +75,7 @@
#include <interfaces/efl_part.eo.h>
#define EQUAL(a, b) ((a) == (b) ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s)", __FILE__, __LINE__, __FUNCTION__), fflush(stderr), 0))
#define STR_EQUAL(a, b) (strcmp((a), (b)) == 0 ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s) '%s' != '%s'", __FILE__, __LINE__, __FUNCTION__, (a), (b)), fflush(stderr), 0))
#define EQUAL(a, b) ((a) == (b) ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s)", __FILE__, __LINE__, __func__), fflush(stderr), 0))
#define STR_EQUAL(a, b) (strcmp((a), (b)) == 0 ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s) '%s' != '%s'", __FILE__, __LINE__, __func__, (a), (b)), fflush(stderr), 0))
#endif

6
src/tests/eina/eina_test_log.c
View File

@ -114,7 +114,7 @@ EFL_START_TEST(eina_log_macro)
ctx.level = lvl; \
ctx.line = __LINE__ + 1; \
ctx.msg = _msg; \
ctx.fnc = __FUNCTION__; \
ctx.fnc = __func__; \
ctx.did = EINA_FALSE
#ifdef EINA_LOG_LEVEL_MAXIMUM
@ -188,7 +188,7 @@ EFL_START_TEST(eina_log_domains_macros)
ctx.level = lvl; \
ctx.line = __LINE__ + 1; \
ctx.msg = _msg; \
ctx.fnc = __FUNCTION__; \
ctx.fnc = __func__; \
ctx.dom = "MyDomain"; \
ctx.did = EINA_FALSE
@ -310,7 +310,7 @@ EFL_START_TEST(eina_log_level_indexes)
ctx.level = lvl; \
ctx.line = __LINE__ + 1; \
ctx.msg = _msg; \
ctx.fnc = __FUNCTION__; \
ctx.fnc = __func__; \
ctx.dom = "Levels"; \
ctx.did = EINA_FALSE;

6
src/tests/eina/eina_test_magic.c
View File

@ -146,7 +146,7 @@ EFL_START_TEST(eina_magic_simple)
#ifdef SHOW_LOG
fprintf(stderr, "you should see 'Input handle pointer is NULL' below\n");
#endif
TEST_MAGIC_SAFETY(__FUNCTION__,
TEST_MAGIC_SAFETY(__func__,
"*** Eina Magic Check Failed !!!\n"
" Input handle pointer is NULL.\n"
"\n");
@ -164,7 +164,7 @@ EFL_START_TEST(eina_magic_simple)
fprintf(stderr,
"you should see 'Input handle has already been freed' below\n");
#endif
TEST_MAGIC_SAFETY(__FUNCTION__,
TEST_MAGIC_SAFETY(__func__,
"*** Eina Magic Check Failed at %p !!!\n"
" Input handle has already been freed.\n"
"\n");
@ -176,7 +176,7 @@ EFL_START_TEST(eina_magic_simple)
#ifdef SHOW_LOG
fprintf(stderr, "you should see 'Input handle is wrong type' below\n");
#endif
TEST_MAGIC_SAFETY(__FUNCTION__,
TEST_MAGIC_SAFETY(__func__,
"*** Eina Magic Check Failed at %p !!!\n"
" Input handle is wrong type.\n"
" Expected: %08x - %s\n"

2
src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
View File

@ -33,7 +33,7 @@
// bool simple_get()
// {
// printf("calling bar::%s\n", __FUNCTION__);
// printf("calling bar::%s\n", __func__);
// return false;
// }
// };

4
src/tests/eolian_cxx/simple.c
View File

@ -18,7 +18,7 @@ static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
static Eina_Bool _simple_simple_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
{
printf("calling %s\n", __FUNCTION__);
printf("calling %s\n", __func__);
return EINA_TRUE;
}
@ -27,7 +27,7 @@ static Eina_Bool _simple_name_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, con
{
static const char* _name= "simple_class";
printf("calling %s= simples class\n", __FUNCTION__);
printf("calling %s= simples class\n", __func__);
*name = _name;
return EINA_TRUE;