From 45a1f7570712e1e1e555ed7d7d5b7112a4d995ca Mon Sep 17 00:00:00 2001 From: tasn Date: Thu, 19 Apr 2012 11:30:17 +0000 Subject: [PATCH] Eobj: s/__UNUSED__/EINA_UNUSED/ I had no idea that exists. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@70332 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- examples/access/inherit.c | 2 +- examples/composite_objects/comp.c | 4 ++-- examples/composite_objects/simple.c | 2 +- examples/constructors/mixin.c | 6 +++--- examples/constructors/simple.c | 10 +++++----- examples/constructors/simple2.c | 2 +- examples/constructors/simple3.c | 2 +- examples/constructors/simple5.c | 2 +- examples/constructors/simple6.c | 2 +- examples/evas/elw_box.c | 2 +- examples/evas/elw_boxedbutton.c | 2 +- examples/evas/elw_button.c | 6 +++--- examples/evas/evas_obj.c | 12 ++++++------ examples/function_overrides/inherit2.c | 6 +++--- examples/function_overrides/inherit3.c | 2 +- examples/function_overrides/simple.c | 4 ++-- examples/mixin/mixin.c | 6 +++--- examples/mixin/mixin2.c | 4 ++-- examples/mixin/mixin3.c | 6 +++--- examples/mixin/simple.c | 4 ++-- examples/signals/simple.c | 2 +- lib/eobj.c | 2 +- lib/eobj_base_class.c | 6 +++--- tests/class_simple.c | 4 ++-- tests/eobj_test_class_errors.c | 4 ++-- 25 files changed, 52 insertions(+), 52 deletions(-) diff --git a/examples/access/inherit.c b/examples/access/inherit.c index 25e9970..adec0b9 100644 --- a/examples/access/inherit.c +++ b/examples/access/inherit.c @@ -11,7 +11,7 @@ EAPI Eobj_Op INHERIT_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_prot_print(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_prot_print(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Simple_Protected_Data *pd = eobj_data_get(obj, SIMPLE_CLASS); (void) list; diff --git a/examples/composite_objects/comp.c b/examples/composite_objects/comp.c index 98819a7..9e1ec39 100644 --- a/examples/composite_objects/comp.c +++ b/examples/composite_objects/comp.c @@ -11,7 +11,7 @@ EAPI Eobj_Op COMP_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_a_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_a_get(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { int *a; a = va_arg(*list, int *); @@ -19,7 +19,7 @@ _a_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); diff --git a/examples/composite_objects/simple.c b/examples/composite_objects/simple.c index d81f05a..55f8700 100644 --- a/examples/composite_objects/simple.c +++ b/examples/composite_objects/simple.c @@ -23,7 +23,7 @@ _a_set(Eobj *obj, void *class_data, va_list *list) } static void -_a_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_a_get(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Simple_Public_Data *pd = class_data; int *a; diff --git a/examples/constructors/mixin.c b/examples/constructors/mixin.c index c050c3a..8cf541d 100644 --- a/examples/constructors/mixin.c +++ b/examples/constructors/mixin.c @@ -9,7 +9,7 @@ EAPI Eobj_Op MIXIN_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_add_and_print_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_add_and_print_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { int a, b, x; eobj_do(obj, SIMPLE_A_GET(&a), SIMPLE_B_GET(&b)); @@ -20,7 +20,7 @@ _add_and_print_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) extern int my_init_count; static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); @@ -28,7 +28,7 @@ _constructor(Eobj *obj, void *class_data __UNUSED__) } static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_destructor_super(obj); diff --git a/examples/constructors/simple.c b/examples/constructors/simple.c index d5dc189..e69cdc0 100644 --- a/examples/constructors/simple.c +++ b/examples/constructors/simple.c @@ -18,7 +18,7 @@ static char *class_var = NULL; #define _GET_SET_FUNC(name) \ static void \ -_##name##_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) \ +_##name##_get(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) \ { \ Private_Data *pd = class_data; \ int *name; \ @@ -27,7 +27,7 @@ _##name##_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) \ printf("%s %d\n", __func__, pd->name); \ } \ static void \ -_##name##_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) \ +_##name##_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) \ { \ Private_Data *pd = class_data; \ int name; \ @@ -42,7 +42,7 @@ _GET_SET_FUNC(b) extern int my_init_count; static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); @@ -50,7 +50,7 @@ _constructor(Eobj *obj, void *class_data __UNUSED__) } static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_destructor_super(obj); @@ -74,7 +74,7 @@ _class_constructor(Eobj_Class *klass) } static void -_class_destructor(Eobj_Class *klass __UNUSED__) +_class_destructor(Eobj_Class *klass EINA_UNUSED) { free(class_var); } diff --git a/examples/constructors/simple2.c b/examples/constructors/simple2.c index 0fcd7b3..71819ee 100644 --- a/examples/constructors/simple2.c +++ b/examples/constructors/simple2.c @@ -7,7 +7,7 @@ static const Eobj_Class *_my_class = NULL; static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); diff --git a/examples/constructors/simple3.c b/examples/constructors/simple3.c index 335aa57..c675066 100644 --- a/examples/constructors/simple3.c +++ b/examples/constructors/simple3.c @@ -7,7 +7,7 @@ static const Eobj_Class *_my_class = NULL; static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { (void) obj; } diff --git a/examples/constructors/simple5.c b/examples/constructors/simple5.c index a2ced9f..f99bd77 100644 --- a/examples/constructors/simple5.c +++ b/examples/constructors/simple5.c @@ -7,7 +7,7 @@ static const Eobj_Class *_my_class = NULL; static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { (void) obj; } diff --git a/examples/constructors/simple6.c b/examples/constructors/simple6.c index d094a35..e4a3026 100644 --- a/examples/constructors/simple6.c +++ b/examples/constructors/simple6.c @@ -7,7 +7,7 @@ static const Eobj_Class *_my_class = NULL; static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); diff --git a/examples/evas/elw_box.c b/examples/evas/elw_box.c index 990110e..d9bb95b 100644 --- a/examples/evas/elw_box.c +++ b/examples/evas/elw_box.c @@ -16,7 +16,7 @@ typedef struct static const Eobj_Class *_my_class = NULL; static void -_pack_end(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_pack_end(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Widget_Data *wd = class_data; Eobj *child_obj; diff --git a/examples/evas/elw_boxedbutton.c b/examples/evas/elw_boxedbutton.c index 6323a1e..58dac76 100644 --- a/examples/evas/elw_boxedbutton.c +++ b/examples/evas/elw_boxedbutton.c @@ -16,7 +16,7 @@ typedef struct static const Eobj_Class *_my_class = NULL; static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); diff --git a/examples/evas/elw_button.c b/examples/evas/elw_button.c index b667345..55b4543 100644 --- a/examples/evas/elw_button.c +++ b/examples/evas/elw_button.c @@ -19,7 +19,7 @@ typedef struct static const Eobj_Class *_my_class = NULL; static void -_position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_position_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { (void) obj; Evas_Coord x, y; @@ -30,7 +30,7 @@ _position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_text_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_text_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Widget_Data *wd = class_data; const char *text; @@ -64,7 +64,7 @@ _constructor(Eobj *obj, void *class_data) } static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_destructor_super(obj); diff --git a/examples/evas/evas_obj.c b/examples/evas/evas_obj.c index 69d728c..b622761 100644 --- a/examples/evas/evas_obj.c +++ b/examples/evas/evas_obj.c @@ -15,7 +15,7 @@ typedef struct } Widget_Data; static void -_position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_position_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Evas_Object *evas_obj = eobj_evas_object_get(obj); Evas_Coord x, y; @@ -25,7 +25,7 @@ _position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_size_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_size_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Evas_Object *evas_obj = eobj_evas_object_get(obj); Evas_Coord w, h; @@ -35,7 +35,7 @@ _size_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_color_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_color_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Evas_Object *evas_obj = eobj_evas_object_get(obj); int r, g, b, a; @@ -47,7 +47,7 @@ _color_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_color_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_color_get(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Evas_Object *evas_obj = eobj_evas_object_get(obj); int *r, *g, *b, *a; @@ -59,7 +59,7 @@ _color_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_visibility_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_visibility_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Evas_Object *evas_obj = eobj_evas_object_get(obj); Eina_Bool v; @@ -78,7 +78,7 @@ _child_add(Eobj *obj, void *class_data, va_list *list) } static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); diff --git a/examples/function_overrides/inherit2.c b/examples/function_overrides/inherit2.c index 68756e6..b5ae192 100644 --- a/examples/function_overrides/inherit2.c +++ b/examples/function_overrides/inherit2.c @@ -13,7 +13,7 @@ EAPI Eobj_Op INHERIT2_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_a_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_a_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { int a; a = va_arg(*list, int); @@ -25,14 +25,14 @@ _a_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_print(Eobj *obj, void *class_data __UNUSED__, va_list *list __UNUSED__) +_print(Eobj *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { printf("Hey\n"); fail_if(eobj_do_super(obj, INHERIT2_PRINT())); } static void -_print2(Eobj *obj __UNUSED__, void *class_data __UNUSED__, va_list *list __UNUSED__) +_print2(Eobj *obj EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { printf("Hey2\n"); } diff --git a/examples/function_overrides/inherit3.c b/examples/function_overrides/inherit3.c index f6be6d7..fa9caf9 100644 --- a/examples/function_overrides/inherit3.c +++ b/examples/function_overrides/inherit3.c @@ -9,7 +9,7 @@ static const Eobj_Class *_my_class = NULL; static void -_a_set(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_a_set(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { int a; a = va_arg(*list, int); diff --git a/examples/function_overrides/simple.c b/examples/function_overrides/simple.c index 48c9a55..285586e 100644 --- a/examples/function_overrides/simple.c +++ b/examples/function_overrides/simple.c @@ -8,7 +8,7 @@ EAPI Eobj_Op SIMPLE_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_a_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_a_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Simple_Public_Data *pd = class_data; int a; @@ -18,7 +18,7 @@ _a_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) } static void -_a_print(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_a_print(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Simple_Public_Data *pd = class_data; (void) list; diff --git a/examples/mixin/mixin.c b/examples/mixin/mixin.c index 54905b9..b95ed83 100644 --- a/examples/mixin/mixin.c +++ b/examples/mixin/mixin.c @@ -9,7 +9,7 @@ EAPI Eobj_Op MIXIN_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_ab_sum_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_ab_sum_get(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { int a, b; eobj_do(obj, SIMPLE_A_GET(&a), SIMPLE_B_GET(&b)); @@ -20,13 +20,13 @@ _ab_sum_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); } static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_destructor_super(obj); } diff --git a/examples/mixin/mixin2.c b/examples/mixin/mixin2.c index 4250615..1155948 100644 --- a/examples/mixin/mixin2.c +++ b/examples/mixin/mixin2.c @@ -28,13 +28,13 @@ _ab_sum_get(Eobj *obj, void *class_data, va_list *list) } static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); } static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_destructor_super(obj); } diff --git a/examples/mixin/mixin3.c b/examples/mixin/mixin3.c index 802b024..4e9a8d7 100644 --- a/examples/mixin/mixin3.c +++ b/examples/mixin/mixin3.c @@ -10,7 +10,7 @@ static const Eobj_Class *_my_class = NULL; static void -_ab_sum_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) +_ab_sum_get(Eobj *obj, void *class_data EINA_UNUSED, va_list *list) { Mixin3_Public_Data *pd = class_data; int *sum = va_arg(*list, int *); @@ -28,13 +28,13 @@ _ab_sum_get(Eobj *obj, void *class_data __UNUSED__, va_list *list) } static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); } static void -_destructor(Eobj *obj, void *class_data __UNUSED__) +_destructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_destructor_super(obj); } diff --git a/examples/mixin/simple.c b/examples/mixin/simple.c index 39e6c85..c8ae49b 100644 --- a/examples/mixin/simple.c +++ b/examples/mixin/simple.c @@ -18,7 +18,7 @@ static const Eobj_Class *_my_class = NULL; #define _GET_SET_FUNC(name) \ static void \ -_##name##_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) \ +_##name##_get(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) \ { \ Private_Data *pd = class_data; \ int *name; \ @@ -27,7 +27,7 @@ _##name##_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) \ printf("%s %d\n", __func__, pd->name); \ } \ static void \ -_##name##_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) \ +_##name##_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) \ { \ Private_Data *pd = class_data; \ int name; \ diff --git a/examples/signals/simple.c b/examples/signals/simple.c index ad02e3f..972d2f4 100644 --- a/examples/signals/simple.c +++ b/examples/signals/simple.c @@ -63,7 +63,7 @@ _cb_deled(void *data, Eobj *obj, const Eobj_Event_Description *desc, void *event } static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { eobj_constructor_super(obj); diff --git a/lib/eobj.c b/lib/eobj.c index e70f1dc..5aab226 100644 --- a/lib/eobj.c +++ b/lib/eobj.c @@ -1034,7 +1034,7 @@ eobj_ref_get(const Eobj *obj) /* Weak reference. */ Eina_Bool -_eobj_weak_ref_cb(void *data, Eobj *obj __UNUSED__, const Eobj_Event_Description *desc __UNUSED__, void *event_info __UNUSED__) +_eobj_weak_ref_cb(void *data, Eobj *obj EINA_UNUSED, const Eobj_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { Eobj_Weak_Ref *wref = data; wref->obj = NULL; diff --git a/lib/eobj_base_class.c b/lib/eobj_base_class.c index 0c57d44..4d34d43 100644 --- a/lib/eobj_base_class.c +++ b/lib/eobj_base_class.c @@ -67,7 +67,7 @@ _data_set(Eobj *obj, void *class_data, va_list *list) } static void -_data_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_data_get(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Private_Data *pd = class_data; const char *key = va_arg(*list, const char *); @@ -92,7 +92,7 @@ _data_get(Eobj *obj __UNUSED__, void *class_data, va_list *list) } static void -_data_del(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_data_del(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Private_Data *pd = class_data; const char *key = va_arg(*list, const char *); @@ -127,7 +127,7 @@ EAPI const Eobj_Event_Description _EOBJ_EV_DEL = EOBJ_EVENT_DESCRIPTION("del", "", "Obj is being deleted."); static void -_constructor(Eobj *obj, void *class_data __UNUSED__) +_constructor(Eobj *obj, void *class_data EINA_UNUSED) { DBG("%p - %s.", obj, eobj_class_name_get(_my_class)); } diff --git a/tests/class_simple.c b/tests/class_simple.c index 6e32ec5..ff65b97 100644 --- a/tests/class_simple.c +++ b/tests/class_simple.c @@ -8,7 +8,7 @@ EAPI Eobj_Op SIMPLE_BASE_ID = 0; static const Eobj_Class *_my_class = NULL; static void -_a_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_a_set(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Simple_Public_Data *pd = class_data; int a; @@ -18,7 +18,7 @@ _a_set(Eobj *obj __UNUSED__, void *class_data, va_list *list) } static void -_a_print(Eobj *obj __UNUSED__, void *class_data, va_list *list) +_a_print(Eobj *obj EINA_UNUSED, void *class_data, va_list *list) { Simple_Public_Data *pd = class_data; (void) list; diff --git a/tests/eobj_test_class_errors.c b/tests/eobj_test_class_errors.c index 0574f45..5637905 100644 --- a/tests/eobj_test_class_errors.c +++ b/tests/eobj_test_class_errors.c @@ -236,8 +236,8 @@ START_TEST(eobj_inconsistent_mro) } END_TEST -static void _stub_constructor(Eobj *obj __UNUSED__, void *data __UNUSED__) {} -static void _stub_class_constructor(Eobj_Class *klass __UNUSED__) {} +static void _stub_constructor(Eobj *obj EINA_UNUSED, void *data EINA_UNUSED) {} +static void _stub_class_constructor(Eobj_Class *klass EINA_UNUSED) {} START_TEST(eobj_bad_interface) { -- 2.7.4