summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-09-28 15:48:17 +0100
committerTom Hacohen <tom@stosb.com>2015-09-28 15:52:50 +0100
commit9328524da41a7d0c7fdb1171ad755d962e282f0f (patch)
tree077d8ed01ec6e294ebebecbd012c5f6514ac8d6f
parent35a482141d2fb3c64aa72ef57a432387915ab653 (diff)
Eo: Remove EO_SENTINEL.
This was never really needed because we always had the count. Removing this now because we are already breaking API and ABI.
-rw-r--r--src/benchmarks/eo/class_simple.c1
-rw-r--r--src/examples/eo/isa/eo_isa_interface.c1
-rw-r--r--src/examples/eo/isa/eo_isa_mixin.c1
-rw-r--r--src/examples/eo/isa/eo_isa_simple.c1
-rw-r--r--src/examples/eo/simple/simple_interface.c1
-rw-r--r--src/examples/eo/simple/simple_mixin.c1
-rw-r--r--src/examples/eo/simple/simple_simple.c1
-rw-r--r--src/lib/eo/Eo.h6
-rw-r--r--src/lib/eo/eo.c3
-rw-r--r--src/tests/eina_cxx/eina_cxx_test_ptrlist.cc1
-rw-r--r--src/tests/eo/access/access_inherit.c1
-rw-r--r--src/tests/eo/access/access_simple.c1
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c1
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c1
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c1
-rw-r--r--src/tests/eo/constructors/constructors_simple.c1
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c1
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c1
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c1
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c1
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c1
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c1
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c1
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c1
-rw-r--r--src/tests/eo/interface/interface_interface.c1
-rw-r--r--src/tests/eo/interface/interface_interface2.c1
-rw-r--r--src/tests/eo/interface/interface_simple.c1
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c1
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c1
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c1
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c1
-rw-r--r--src/tests/eo/mixin/mixin_simple.c1
-rw-r--r--src/tests/eo/signals/signals_simple.c1
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c1
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c1
-rw-r--r--src/tests/eo/suite/eo_test_general.c3
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c1
-rw-r--r--src/tests/eolian/data/override_ref.c3
39 files changed, 4 insertions, 49 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index ad5e631524..2508959706 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -18,7 +18,6 @@ EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
18 18
19static Eo_Op_Description op_desc[] = { 19static Eo_Op_Description op_desc[] = {
20 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), 20 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
21 EO_OP_SENTINEL
22}; 21};
23 22
24static const Eo_Class_Description class_desc = { 23static const Eo_Class_Description class_desc = {
diff --git a/src/examples/eo/isa/eo_isa_interface.c b/src/examples/eo/isa/eo_isa_interface.c
index 95f026699f..229f298c48 100644
--- a/src/examples/eo/isa/eo_isa_interface.c
+++ b/src/examples/eo/isa/eo_isa_interface.c
@@ -11,7 +11,6 @@ EAPI EO_FUNC_BODY(interface_a_power_3_get, int, 0);
11 11
12static Eo_Op_Description op_desc[] = { 12static Eo_Op_Description op_desc[] = {
13 EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"), 13 EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"),
14 EO_OP_SENTINEL
15}; 14};
16 15
17static const Eo_Class_Description class_desc = { 16static const Eo_Class_Description class_desc = {
diff --git a/src/examples/eo/isa/eo_isa_mixin.c b/src/examples/eo/isa/eo_isa_mixin.c
index 601c44e47b..ec6dba04b8 100644
--- a/src/examples/eo/isa/eo_isa_mixin.c
+++ b/src/examples/eo/isa/eo_isa_mixin.c
@@ -22,7 +22,6 @@ EAPI EO_FUNC_BODY(mixin_a_square_get, int, 0);
22 22
23static Eo_Op_Description op_desc[] = { 23static Eo_Op_Description op_desc[] = {
24 EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"), 24 EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"),
25 EO_OP_SENTINEL
26}; 25};
27 26
28static const Eo_Class_Description class_desc = { 27static const Eo_Class_Description class_desc = {
diff --git a/src/examples/eo/isa/eo_isa_simple.c b/src/examples/eo/isa/eo_isa_simple.c
index f5dcb3c6de..d38bfe1082 100644
--- a/src/examples/eo/isa/eo_isa_simple.c
+++ b/src/examples/eo/isa/eo_isa_simple.c
@@ -43,7 +43,6 @@ static Eo_Op_Description op_desc[] = {
43 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), 43 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
44 EO_OP_FUNC(simple_a_get, _a_get, "Get property A"), 44 EO_OP_FUNC(simple_a_get, _a_get, "Get property A"),
45 EO_OP_FUNC_OVERRIDE(interface_a_power_3_get, _a_power_3_get), 45 EO_OP_FUNC_OVERRIDE(interface_a_power_3_get, _a_power_3_get),
46 EO_OP_SENTINEL
47}; 46};
48 47
49static const Eo_Class_Description class_desc = { 48static const Eo_Class_Description class_desc = {
diff --git a/src/examples/eo/simple/simple_interface.c b/src/examples/eo/simple/simple_interface.c
index eeda051a1c..3015f3306f 100644
--- a/src/examples/eo/simple/simple_interface.c
+++ b/src/examples/eo/simple/simple_interface.c
@@ -11,7 +11,6 @@ EAPI EO_FUNC_BODY(interface_a_power_3_get, int, 0);
11 11
12static Eo_Op_Description op_desc[] = { 12static Eo_Op_Description op_desc[] = {
13 EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"), 13 EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"),
14 EO_OP_SENTINEL
15}; 14};
16 15
17static const Eo_Class_Description class_desc = { 16static const Eo_Class_Description class_desc = {
diff --git a/src/examples/eo/simple/simple_mixin.c b/src/examples/eo/simple/simple_mixin.c
index 9173453065..734ca968cc 100644
--- a/src/examples/eo/simple/simple_mixin.c
+++ b/src/examples/eo/simple/simple_mixin.c
@@ -22,7 +22,6 @@ EAPI EO_FUNC_BODY(mixin_a_square_get, int, 0);
22 22
23static Eo_Op_Description op_desc[] = { 23static Eo_Op_Description op_desc[] = {
24 EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"), 24 EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"),
25 EO_OP_SENTINEL
26}; 25};
27 26
28static const Eo_Class_Description class_desc = { 27static const Eo_Class_Description class_desc = {
diff --git a/src/examples/eo/simple/simple_simple.c b/src/examples/eo/simple/simple_simple.c
index 480938ffc5..1cd92c9960 100644
--- a/src/examples/eo/simple/simple_simple.c
+++ b/src/examples/eo/simple/simple_simple.c
@@ -43,7 +43,6 @@ static Eo_Op_Description op_desc[] = {
43 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), 43 EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
44 EO_OP_FUNC(simple_a_get, _a_get, "Get property A"), 44 EO_OP_FUNC(simple_a_get, _a_get, "Get property A"),
45 EO_OP_FUNC_OVERRIDE(interface_a_power_3_get, _a_power_3_get), 45 EO_OP_FUNC_OVERRIDE(interface_a_power_3_get, _a_power_3_get),
46 EO_OP_SENTINEL
47}; 46};
48 47
49static const Eo_Class_Description class_desc = { 48static const Eo_Class_Description class_desc = {
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index e3c5f1c189..da16feb3b8 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -428,12 +428,9 @@ EAPI Eina_Bool eo_init(void);
428 */ 428 */
429EAPI Eina_Bool eo_shutdown(void); 429EAPI Eina_Bool eo_shutdown(void);
430 430
431// computes size of Eo_Op_Description[]
432#define EO_OP_DESC_SIZE(desc) (sizeof(desc)/sizeof(*desc) - 1)
433
434// Helpers macro to help populating #Eo_Class_Description. 431// Helpers macro to help populating #Eo_Class_Description.
435#define EO_CLASS_DESCRIPTION_NOOPS() { NULL, 0} 432#define EO_CLASS_DESCRIPTION_NOOPS() { NULL, 0}
436#define EO_CLASS_DESCRIPTION_OPS(op_descs) { op_descs, EO_OP_DESC_SIZE(op_descs) } 433#define EO_CLASS_DESCRIPTION_OPS(op_descs) { op_descs, EINA_C_ARRAY_LENGTH(op_descs) }
437 434
438// to fetch internal function and object data at once 435// to fetch internal function and object data at once
439typedef struct _Eo_Op_Call_Data 436typedef struct _Eo_Op_Call_Data
@@ -538,7 +535,6 @@ EAPI extern Eo_Hook_Call eo_hook_call_post;
538#define EO_OP_CLASS_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_CLASS } 535#define EO_OP_CLASS_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_CLASS }
539#define EO_OP_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_REGULAR } 536#define EO_OP_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_REGULAR }
540#define EO_OP_CLASS_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_CLASS } 537#define EO_OP_CLASS_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_CLASS }
541#define EO_OP_SENTINEL { _EO_OP_API_ENTRY(NULL), NULL, 0, EO_OP_TYPE_INVALID }
542 538
543// returns the OP id corresponding to the given api_func 539// returns the OP id corresponding to the given api_func
544EAPI Eo_Op _eo_api_op_id_get(const void *api_func, Eina_Bool is_main_loop, const char *file, int line); 540EAPI Eo_Op _eo_api_op_id_get(const void *api_func, Eina_Bool is_main_loop, const char *file, int line);
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index da38fdcf02..b92aa8e05a 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -816,6 +816,7 @@ eo_api_funcs_cmp(const void *p1, const void *p2)
816static Eina_Bool 816static Eina_Bool
817_eo_class_funcs_set(_Eo_Class *klass) 817_eo_class_funcs_set(_Eo_Class *klass)
818{ 818{
819 unsigned int i;
819 int op_id; 820 int op_id;
820 const void *last_api_func; 821 const void *last_api_func;
821 const Eo_Op_Description *api_desc; 822 const Eo_Op_Description *api_desc;
@@ -832,7 +833,7 @@ _eo_class_funcs_set(_Eo_Class *klass)
832 qsort((void*)op_descs, klass->desc->ops.count, sizeof(Eo_Op_Description), eo_api_funcs_cmp); 833 qsort((void*)op_descs, klass->desc->ops.count, sizeof(Eo_Op_Description), eo_api_funcs_cmp);
833 834
834 last_api_func = NULL; 835 last_api_func = NULL;
835 for (op_desc = op_descs; op_desc->op_type != EO_OP_TYPE_INVALID; op_desc++) 836 for (i = 0, op_desc = op_descs; i < klass->desc->ops.count; i++, op_desc++)
836 { 837 {
837 if(op_desc->api_func == NULL) 838 if(op_desc->api_func == NULL)
838 { 839 {
diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
index 1f6144d04b..35f2cef9ed 100644
--- a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
@@ -31,7 +31,6 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
31static Eo_Op_Description op_descs[] = { 31static Eo_Op_Description op_descs[] = {
32 EO_OP_FUNC_OVERRIDE(reinterpret_cast<void*>(&eo_constructor), reinterpret_cast<void*>(&_constructor)) 32 EO_OP_FUNC_OVERRIDE(reinterpret_cast<void*>(&eo_constructor), reinterpret_cast<void*>(&_constructor))
33 , EO_OP_FUNC_OVERRIDE(reinterpret_cast<void*>(&eo_destructor), reinterpret_cast<void*>(&_destructor)) 33 , EO_OP_FUNC_OVERRIDE(reinterpret_cast<void*>(&eo_destructor), reinterpret_cast<void*>(&_destructor))
34 , EO_OP_SENTINEL
35}; 34};
36 35
37static const Eo_Class_Description class_desc = { 36static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index bf12979dab..6ab831fe19 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -20,7 +20,6 @@ EAPI EO_VOID_FUNC_BODY(inherit_prot_print);
20 20
21static Eo_Op_Description op_descs[] = { 21static Eo_Op_Description op_descs[] = {
22 EO_OP_FUNC(inherit_prot_print, _prot_print), 22 EO_OP_FUNC(inherit_prot_print, _prot_print),
23 EO_OP_SENTINEL
24}; 23};
25 24
26static const Eo_Class_Description class_desc = { 25static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index accf54122f..55e55e0a57 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -34,7 +34,6 @@ EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
34 34
35static Eo_Op_Description op_descs[] = { 35static Eo_Op_Description op_descs[] = {
36 EO_OP_FUNC(simple_a_set, _a_set), 36 EO_OP_FUNC(simple_a_set, _a_set),
37 EO_OP_SENTINEL
38}; 37};
39 38
40static const Eo_Event_Description *event_desc[] = { 39static const Eo_Event_Description *event_desc[] = {
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 1e59b4d115..32116c986a 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -42,7 +42,6 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
42static Eo_Op_Description op_descs[] = { 42static Eo_Op_Description op_descs[] = {
43 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 43 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
44 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get), 44 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
45 EO_OP_SENTINEL
46}; 45};
47 46
48static const Eo_Class_Description class_desc = { 47static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index cf95f998e0..b9c906e66f 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -166,7 +166,6 @@ static Eo_Op_Description op_descs[] = {
166 EO_OP_FUNC(simple_a_get32, _a_get), 166 EO_OP_FUNC(simple_a_get32, _a_get),
167 EO_OP_FUNC(simple_a_set, _a_set), 167 EO_OP_FUNC(simple_a_set, _a_set),
168 EO_OP_FUNC(simple_a_get, _a_get), 168 EO_OP_FUNC(simple_a_get, _a_get),
169 EO_OP_SENTINEL
170}; 169};
171 170
172static const Eo_Event_Description *event_desc[] = { 171static const Eo_Event_Description *event_desc[] = {
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 3fb1c67673..10213b1b09 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -40,7 +40,6 @@ static Eo_Op_Description op_descs[] = {
40 EO_OP_FUNC(mixin_add_and_print, _add_and_print_set), 40 EO_OP_FUNC(mixin_add_and_print, _add_and_print_set),
41 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 41 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
42 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor), 42 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
43 EO_OP_SENTINEL
44}; 43};
45 44
46static const Eo_Class_Description class_desc = { 45static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index 2d1c4d78ec..d28748539a 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -93,7 +93,6 @@ static Eo_Op_Description op_descs[] = {
93 EO_OP_FUNC(simple_a_get, _a_get), 93 EO_OP_FUNC(simple_a_get, _a_get),
94 EO_OP_FUNC(simple_b_set, _b_set), 94 EO_OP_FUNC(simple_b_set, _b_set),
95 EO_OP_FUNC(simple_b_get, _b_get), 95 EO_OP_FUNC(simple_b_get, _b_get),
96 EO_OP_SENTINEL
97}; 96};
98 97
99static const Eo_Class_Description class_desc = { 98static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index fdda2a60ec..e0c6804465 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -18,7 +18,6 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
18 18
19static Eo_Op_Description op_descs[] = { 19static Eo_Op_Description op_descs[] = {
20 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 20 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
21 EO_OP_SENTINEL
22}; 21};
23 22
24static const Eo_Class_Description class_desc = { 23static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 16d3fc8063..f307b5148f 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -16,7 +16,6 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
16 16
17static Eo_Op_Description op_descs[] = { 17static Eo_Op_Description op_descs[] = {
18 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 18 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
19 EO_OP_SENTINEL
20}; 19};
21 20
22static const Eo_Class_Description class_desc = { 21static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index df51e4ae87..0e319c5bd6 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -16,7 +16,6 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
16 16
17static Eo_Op_Description op_descs[] = { 17static Eo_Op_Description op_descs[] = {
18 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor), 18 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
19 EO_OP_SENTINEL
20}; 19};
21 20
22static const Eo_Class_Description class_desc = { 21static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 5b3f485c68..9f4355dfa7 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -16,7 +16,6 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
16 16
17static Eo_Op_Description op_descs [] = { 17static Eo_Op_Description op_descs [] = {
18 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor), 18 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
19 EO_OP_SENTINEL
20}; 19};
21 20
22static const Eo_Class_Description class_desc = { 21static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 79dce35c06..d3ec9ea4c0 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -20,7 +20,6 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
20 20
21static Eo_Op_Description op_descs [] = { 21static Eo_Op_Description op_descs [] = {
22 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 22 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
23 EO_OP_SENTINEL
24}; 23};
25 24
26static const Eo_Class_Description class_desc = { 25static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 27c3d206c6..e250ee3d2c 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -64,7 +64,6 @@ static Eo_Op_Description op_descs[] = {
64 EO_OP_FUNC(inherit2_print2, _print2), 64 EO_OP_FUNC(inherit2_print2, _print2),
65 EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print), 65 EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
66 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 66 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
67 EO_OP_SENTINEL
68}; 67};
69 68
70static const Eo_Class_Description class_desc = { 69static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index d8b6190098..2f96d590ee 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -18,7 +18,6 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
18 18
19static Eo_Op_Description op_descs[] = { 19static Eo_Op_Description op_descs[] = {
20 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 20 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
21 EO_OP_SENTINEL
22}; 21};
23 22
24static const Eo_Class_Description class_desc = { 23static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index be73ec437c..dc5f0dd4a1 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -61,7 +61,6 @@ static Eo_Op_Description op_descs[] = {
61 EO_OP_FUNC(simple_a_print, _a_print), 61 EO_OP_FUNC(simple_a_print, _a_print),
62 EO_OP_FUNC(simple_class_print, _class_print), 62 EO_OP_FUNC(simple_class_print, _class_print),
63 EO_OP_FUNC(simple_class_print2, _class_print2), 63 EO_OP_FUNC(simple_class_print2, _class_print2),
64 EO_OP_SENTINEL
65}; 64};
66 65
67static const Eo_Class_Description class_desc = { 66static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index 479d64afc0..32b00c89f5 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -12,7 +12,6 @@ EO_FUNC_BODY(interface_ab_sum_get, int, 0);
12 12
13static Eo_Op_Description op_descs[] = { 13static Eo_Op_Description op_descs[] = {
14 EO_OP_FUNC(interface_ab_sum_get, NULL), 14 EO_OP_FUNC(interface_ab_sum_get, NULL),
15 EO_OP_SENTINEL
16}; 15};
17 16
18static const Eo_Class_Description class_desc = { 17static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index b8d28f941a..12cbb9261a 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -13,7 +13,6 @@ EO_FUNC_BODY(interface2_ab_sum_get2, int, 0);
13 13
14static Eo_Op_Description op_descs[] = { 14static Eo_Op_Description op_descs[] = {
15 EO_OP_FUNC(interface2_ab_sum_get2, NULL), 15 EO_OP_FUNC(interface2_ab_sum_get2, NULL),
16 EO_OP_SENTINEL
17}; 16};
18 17
19static const Eo_Class_Description class_desc = { 18static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 19b0544e9f..cad7f24000 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -61,7 +61,6 @@ static Eo_Op_Description op_descs[] = {
61 EO_OP_FUNC(simple_b_get, _b_get), 61 EO_OP_FUNC(simple_b_get, _b_get),
62 EO_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get), 62 EO_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
63 EO_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2), 63 EO_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
64 EO_OP_SENTINEL
65}; 64};
66 65
67static const Eo_Class_Description class_desc = { 66static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 521acbe721..8098c1c220 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -21,7 +21,6 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
21 21
22static Eo_Op_Description op_descs[] = { 22static Eo_Op_Description op_descs[] = {
23 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get), 23 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
24 EO_OP_SENTINEL
25}; 24};
26 25
27static const Eo_Class_Description class_desc = { 26static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index dc6f91cef3..d8569d4982 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -35,7 +35,6 @@ static Eo_Op_Description op_descs[] = {
35 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 35 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
36 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor), 36 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
37 EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 37 EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
38 EO_OP_SENTINEL
39}; 38};
40 39
41static const Eo_Class_Description class_desc = { 40static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 60f3d40080..7aff72bde1 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -49,7 +49,6 @@ static Eo_Op_Description op_descs[] = {
49 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 49 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
50 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor), 50 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
51 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), 51 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
52 EO_OP_SENTINEL
53}; 52};
54 53
55static const Eo_Class_Description class_desc = { 54static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index cd2d732898..d5c2ed7adf 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -48,7 +48,6 @@ static Eo_Op_Description op_descs[] = {
48 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 48 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
49 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor), 49 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
50 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), 50 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
51 EO_OP_SENTINEL
52}; 51};
53 52
54static const Eo_Class_Description class_desc = { 53static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index bc0a9f73a6..5184e0ec96 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -42,7 +42,6 @@ static Eo_Op_Description op_descs[] = {
42 EO_OP_FUNC(simple_a_get, _a_get), 42 EO_OP_FUNC(simple_a_get, _a_get),
43 EO_OP_FUNC(simple_b_set, _b_set), 43 EO_OP_FUNC(simple_b_set, _b_set),
44 EO_OP_FUNC(simple_b_get, _b_get), 44 EO_OP_FUNC(simple_b_get, _b_get),
45 EO_OP_SENTINEL
46}; 45};
47 46
48static const Eo_Class_Description class_desc = { 47static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 437c78c319..7b55cf8d5b 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -78,7 +78,6 @@ EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
78static Eo_Op_Description op_descs[] = { 78static Eo_Op_Description op_descs[] = {
79 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 79 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
80 EO_OP_FUNC(simple_a_set, _a_set), 80 EO_OP_FUNC(simple_a_set, _a_set),
81 EO_OP_SENTINEL
82}; 81};
83 82
84 83
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index a54a2f2cbc..8ca7f3d600 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -28,7 +28,6 @@ START_TEST(eo_destructor_unref)
28 28
29 static Eo_Op_Description op_descs [] = { 29 static Eo_Op_Description op_descs [] = {
30 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor_unref), 30 EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor_unref),
31 EO_OP_SENTINEL
32 }; 31 };
33 32
34 static Eo_Class_Description class_desc = { 33 static Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index c2501186e1..e108b5c2d1 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -218,7 +218,6 @@ START_TEST(eo_null_api)
218 218
219 static Eo_Op_Description op_descs[] = { 219 static Eo_Op_Description op_descs[] = {
220 EO_OP_FUNC(NULL, _null_fct), 220 EO_OP_FUNC(NULL, _null_fct),
221 EO_OP_SENTINEL
222 }; 221 };
223 static Eo_Class_Description class_desc = { 222 static Eo_Class_Description class_desc = {
224 EO_VERSION, 223 EO_VERSION,
@@ -251,7 +250,6 @@ START_TEST(eo_wrong_override)
251 250
252 static Eo_Op_Description op_descs[] = { 251 static Eo_Op_Description op_descs[] = {
253 EO_OP_FUNC_OVERRIDE(null_fct, _null_fct), 252 EO_OP_FUNC_OVERRIDE(null_fct, _null_fct),
254 EO_OP_SENTINEL
255 }; 253 };
256 static Eo_Class_Description class_desc = { 254 static Eo_Class_Description class_desc = {
257 EO_VERSION, 255 EO_VERSION,
@@ -285,7 +283,6 @@ START_TEST(eo_api_redefined)
285 static Eo_Op_Description op_descs[] = { 283 static Eo_Op_Description op_descs[] = {
286 EO_OP_FUNC(null_fct, _null_fct), 284 EO_OP_FUNC(null_fct, _null_fct),
287 EO_OP_FUNC(null_fct, NULL), 285 EO_OP_FUNC(null_fct, NULL),
288 EO_OP_SENTINEL
289 }; 286 };
290 static Eo_Class_Description class_desc = { 287 static Eo_Class_Description class_desc = {
291 EO_VERSION, 288 EO_VERSION,
@@ -319,7 +316,6 @@ START_TEST(eo_dich_func_override)
319 static Eo_Op_Description op_descs[] = { 316 static Eo_Op_Description op_descs[] = {
320 EO_OP_FUNC_OVERRIDE(simple_a_set, _null_fct), 317 EO_OP_FUNC_OVERRIDE(simple_a_set, _null_fct),
321 EO_OP_FUNC_OVERRIDE(simple_a_set, NULL), 318 EO_OP_FUNC_OVERRIDE(simple_a_set, NULL),
322 EO_OP_SENTINEL
323 }; 319 };
324 static Eo_Class_Description class_desc = { 320 static Eo_Class_Description class_desc = {
325 EO_VERSION, 321 EO_VERSION,
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 64fe1fbb5f..8e75eed5c3 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -94,7 +94,6 @@ static Eo_Op_Description op_descs[] = {
94 EO_OP_FUNC(simple_recursive, _recursive), 94 EO_OP_FUNC(simple_recursive, _recursive),
95 EO_OP_FUNC(simple_part_get, _part_get), 95 EO_OP_FUNC(simple_part_get, _part_get),
96 EO_OP_FUNC(simple_pure_virtual, NULL), 96 EO_OP_FUNC(simple_pure_virtual, NULL),
97 EO_OP_SENTINEL
98}; 97};
99 98
100static const Eo_Class_Description class_desc = { 99static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 9428fb8ba1..ccd6af2b45 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -315,7 +315,6 @@ _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
315static Eo_Op_Description op_descs[] = { 315static Eo_Op_Description op_descs[] = {
316 EO_OP_FUNC_OVERRIDE(eo_constructor, _man_con), 316 EO_OP_FUNC_OVERRIDE(eo_constructor, _man_con),
317 EO_OP_FUNC_OVERRIDE(eo_destructor, _man_des), 317 EO_OP_FUNC_OVERRIDE(eo_destructor, _man_des),
318 EO_OP_SENTINEL
319}; 318};
320 319
321START_TEST(eo_man_free) 320START_TEST(eo_man_free)
@@ -724,7 +723,6 @@ EO_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE);
724static Eo_Op_Description _multi_do_op_descs[] = { 723static Eo_Op_Description _multi_do_op_descs[] = {
725 EO_OP_FUNC(multi_a_print, _a_print), 724 EO_OP_FUNC(multi_a_print, _a_print),
726 EO_OP_FUNC(multi_class_hi_print, _class_hi_print), 725 EO_OP_FUNC(multi_class_hi_print, _class_hi_print),
727 EO_OP_SENTINEL
728}; 726};
729 727
730START_TEST(eo_multiple_do) 728START_TEST(eo_multiple_do)
@@ -896,7 +894,6 @@ _eo_add_failures_finalize(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
896 894
897static Eo_Op_Description _eo_add_failures_op_descs[] = { 895static Eo_Op_Description _eo_add_failures_op_descs[] = {
898 EO_OP_FUNC_OVERRIDE(eo_finalize, _eo_add_failures_finalize), 896 EO_OP_FUNC_OVERRIDE(eo_finalize, _eo_add_failures_finalize),
899 EO_OP_SENTINEL
900}; 897};
901 898
902START_TEST(eo_add_failures) 899START_TEST(eo_add_failures)
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 25cdbc63d9..e58b88b613 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -63,7 +63,6 @@ static Eo_Op_Description op_descs[] = {
63 EO_OP_FUNC(thread_test_constructor, _constructor), 63 EO_OP_FUNC(thread_test_constructor, _constructor),
64 EO_OP_FUNC(thread_test_v_get, _v_get), 64 EO_OP_FUNC(thread_test_v_get, _v_get),
65 EO_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack), 65 EO_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
66 EO_OP_SENTINEL
67}; 66};
68 67
69static const Eo_Class_Description class_desc = { 68static const Eo_Class_Description class_desc = {
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index 5e68f31b55..58179156ae 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -65,7 +65,6 @@ static Eo_Op_Description _override_op_desc[] = {
65 EO_OP_FUNC(override_a_get, _override_a_get), 65 EO_OP_FUNC(override_a_get, _override_a_get),
66 EO_OP_FUNC(override_b_get, _override_b_get), 66 EO_OP_FUNC(override_b_get, _override_b_get),
67 EO_OP_FUNC(override_c_set, _override_c_set), 67 EO_OP_FUNC(override_c_set, _override_c_set),
68 EO_OP_SENTINEL
69}; 68};
70 69
71static const Eo_Class_Description _override_class_desc = { 70static const Eo_Class_Description _override_class_desc = {
@@ -79,4 +78,4 @@ static const Eo_Class_Description _override_class_desc = {
79 NULL 78 NULL
80}; 79};
81 80
82EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL); \ No newline at end of file 81EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);