summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
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/ecore_con
parentde939ca64b3d17ee786f3fc621314fce1746334e (diff)
downloadefl-d135957ffa0ae429f4ca22662de8633771984485.tar.gz
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 'src/lib/ecore_con')
-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
4 files changed, 6 insertions, 6 deletions
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 {
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__; \
} \
} \
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
{ \
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__); \
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
#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)
{
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
#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)
{