diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2020-05-07 09:27:07 -0400 |
---|---|---|
committer | Christopher Michael <devilhorns@comcast.net> | 2020-05-07 09:27:07 -0400 |
commit | d135957ffa0ae429f4ca22662de8633771984485 (patch) | |
tree | 8dcacdd71c83d4c5a7ffb239e428dd81e5d725df /src/lib/ecore_evas | |
parent | de939ca64b3d17ee786f3fc621314fce1746334e (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 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 8 | ||||
-rw-r--r-- | src/lib/ecore_evas/ecore_evas_util.c | 14 |
2 files changed, 11 insertions, 11 deletions
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) | |||
2785 | EAPI void | 2785 | EAPI void |
2786 | ecore_evas_draw_frame_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool draw_frame EINA_UNUSED) | 2786 | ecore_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 | ||
2791 | EAPI Eina_Bool | 2791 | EAPI Eina_Bool |
2792 | ecore_evas_draw_frame_get(const Ecore_Evas *ee EINA_UNUSED) | 2792 | ecore_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) | |||
86 | static void | 86 | static 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 | ||
92 | static void | 92 | static 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 | ||
98 | static void | 98 | static 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 | { |