diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-10-05 20:09:47 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-10-05 20:09:47 +0000 |
commit | 7fe3d3599446108bc36a0ab6ec563a267db02733 (patch) | |
tree | 8c45e7b3087e289466d4fb4ff99b12b209b770f6 | |
parent | 227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff) |
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
60 files changed, 428 insertions, 419 deletions
diff --git a/configure.ac b/configure.ac index a065c005b7..4936c3a1f8 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -197,7 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) | |||
197 | #### Additional options to configure | 197 | #### Additional options to configure |
198 | 198 | ||
199 | EFL_ENABLE_LIB([eet], [yes]) | 199 | EFL_ENABLE_LIB([eet], [yes]) |
200 | EFL_ENABLE_LIB([eo], [no]) | 200 | EFL_ENABLE_LIB([eo], [yes]) |
201 | 201 | ||
202 | 202 | ||
203 | # Assert or fail. | 203 | # Assert or fail. |
@@ -275,7 +275,6 @@ EFL_CHECK_PATH_MAX | |||
275 | 275 | ||
276 | AC_C_BIGENDIAN | 276 | AC_C_BIGENDIAN |
277 | AC_C_INLINE | 277 | AC_C_INLINE |
278 | EFL_ATTRIBUTE_UNUSED | ||
279 | # EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra]) | 278 | # EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra]) |
280 | 279 | ||
281 | 280 | ||
@@ -1162,7 +1161,10 @@ AC_MSG_NOTICE([Eo checks]) | |||
1162 | 1161 | ||
1163 | requirements_pc_eo="eina >= 1.7.99" | 1162 | requirements_pc_eo="eina >= 1.7.99" |
1164 | 1163 | ||
1165 | PKG_CHECK_MODULES([EO], [${requirements_pc_eo}]) | 1164 | AC_ARG_VAR([EO_CFLAGS], [preprocessor flags for Eo]) |
1165 | AC_SUBST([EO_CFLAGS]) | ||
1166 | AC_ARG_VAR([EO_LIBS], [linker flags for Eo]) | ||
1167 | AC_SUBST([EO_LIBS]) | ||
1166 | 1168 | ||
1167 | # Example (evas one) | 1169 | # Example (evas one) |
1168 | 1170 | ||
diff --git a/m4/efl_attribute.m4 b/m4/efl_attribute.m4 index 78bff15679..cd42e9cda6 100644 --- a/m4/efl_attribute.m4 +++ b/m4/efl_attribute.m4 | |||
@@ -3,30 +3,6 @@ dnl That code is public domain and can be freely used or copied. | |||
3 | 3 | ||
4 | dnl Macros for checking if the compiler supports some __attribute__ uses | 4 | dnl Macros for checking if the compiler supports some __attribute__ uses |
5 | 5 | ||
6 | dnl Usage: EFL_ATTRIBUTE_UNUSED | ||
7 | dnl call AC_DEFINE for __UNUSED__ if __attribute__((unused)) is available | ||
8 | |||
9 | AC_DEFUN([EFL_ATTRIBUTE_UNUSED], | ||
10 | [ | ||
11 | AC_MSG_CHECKING([for __attribute__ ((unused))]) | ||
12 | AC_COMPILE_IFELSE( | ||
13 | [AC_LANG_PROGRAM( | ||
14 | [[ | ||
15 | void foo(int x __attribute__ ((unused))) {} | ||
16 | ]], | ||
17 | [[ | ||
18 | ]])], | ||
19 | [have_attribute_unused="yes"], | ||
20 | [have_attribute_unused="no"]) | ||
21 | AC_MSG_RESULT([${have_attribute_unused}]) | ||
22 | |||
23 | if test "x${have_attribute_unused}" = "xyes" ; then | ||
24 | AC_DEFINE([__UNUSED__], [__attribute__ ((unused))], [Macro declaring a function argument to be unused.]) | ||
25 | else | ||
26 | AC_DEFINE([__UNUSED__], [], [__attribute__ ((unused)) is not supported.]) | ||
27 | fi | ||
28 | ]) | ||
29 | |||
30 | dnl Usage: EFL_ATTRIBUTE_VECTOR | 6 | dnl Usage: EFL_ATTRIBUTE_VECTOR |
31 | dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available | 7 | dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available |
32 | 8 | ||
diff --git a/src/benchmarks/eina/eina_bench_array.c b/src/benchmarks/eina/eina_bench_array.c index 425eddd94c..5b974d1244 100644 --- a/src/benchmarks/eina/eina_bench_array.c +++ b/src/benchmarks/eina/eina_bench_array.c | |||
@@ -47,7 +47,7 @@ struct _Eina_Bench_Object | |||
47 | Eina_Bool keep; | 47 | Eina_Bool keep; |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static Eina_Bool keep(void *data, __UNUSED__ void *gdata) | 50 | static Eina_Bool keep(void *data, EINA_UNUSED void *gdata) |
51 | { | 51 | { |
52 | Eina_Bench_Object *bo = data; | 52 | Eina_Bench_Object *bo = data; |
53 | 53 | ||
@@ -109,16 +109,16 @@ eina_bench_array_4evas_render_inline(int request) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | static Eina_Bool | 111 | static Eina_Bool |
112 | eina_iterator_ebo_free(__UNUSED__ const Eina_Array *array, | 112 | eina_iterator_ebo_free(EINA_UNUSED const Eina_Array *array, |
113 | Eina_Bench_Object *ebo, __UNUSED__ void *fdata) | 113 | Eina_Bench_Object *ebo, EINA_UNUSED void *fdata) |
114 | { | 114 | { |
115 | free(ebo); | 115 | free(ebo); |
116 | return EINA_TRUE; | 116 | return EINA_TRUE; |
117 | } | 117 | } |
118 | 118 | ||
119 | static Eina_Bool | 119 | static Eina_Bool |
120 | eina_iterator_ebo_rand(__UNUSED__ const void *container, | 120 | eina_iterator_ebo_rand(EINA_UNUSED const void *container, |
121 | Eina_Bench_Object *ebo, __UNUSED__ void *fdata) | 121 | Eina_Bench_Object *ebo, EINA_UNUSED void *fdata) |
122 | { | 122 | { |
123 | ebo->keep = rand() < (RAND_MAX / 2) ? ebo->keep : EINA_FALSE; | 123 | ebo->keep = rand() < (RAND_MAX / 2) ? ebo->keep : EINA_FALSE; |
124 | return EINA_TRUE; | 124 | return EINA_TRUE; |
@@ -609,7 +609,7 @@ _eina_ecore_for_each_remove(void *value, void *user_data) | |||
609 | } | 609 | } |
610 | 610 | ||
611 | static void | 611 | static void |
612 | _eina_ecore_for_each_rand(void *value, __UNUSED__ void *user_data) | 612 | _eina_ecore_for_each_rand(void *value, EINA_UNUSED void *user_data) |
613 | { | 613 | { |
614 | Eina_Bench_Object *ebo = value; | 614 | Eina_Bench_Object *ebo = value; |
615 | 615 | ||
diff --git a/src/benchmarks/eina/eina_bench_hash.c b/src/benchmarks/eina/eina_bench_hash.c index 0429097c70..e0e9774504 100644 --- a/src/benchmarks/eina/eina_bench_hash.c +++ b/src/benchmarks/eina/eina_bench_hash.c | |||
@@ -52,8 +52,8 @@ _eina_string_key_length(const char *key) | |||
52 | } | 52 | } |
53 | 53 | ||
54 | static int | 54 | static int |
55 | _eina_string_key_cmp(const char *key1, __UNUSED__ int key1_length, | 55 | _eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length, |
56 | const char *key2, __UNUSED__ int key2_length) | 56 | const char *key2, EINA_UNUSED int key2_length) |
57 | { | 57 | { |
58 | return strcmp(key1, key2); | 58 | return strcmp(key1, key2); |
59 | } | 59 | } |
@@ -71,7 +71,7 @@ struct _Eina_Bench_Rbtree | |||
71 | static Eina_Rbtree_Direction | 71 | static Eina_Rbtree_Direction |
72 | _eina_bench_rbtree_cmp(const Eina_Bench_Rbtree *left, | 72 | _eina_bench_rbtree_cmp(const Eina_Bench_Rbtree *left, |
73 | const Eina_Bench_Rbtree *right, | 73 | const Eina_Bench_Rbtree *right, |
74 | __UNUSED__ void *data) | 74 | EINA_UNUSED void *data) |
75 | { | 75 | { |
76 | if (!left) | 76 | if (!left) |
77 | return EINA_RBTREE_RIGHT; | 77 | return EINA_RBTREE_RIGHT; |
@@ -87,13 +87,13 @@ static inline int | |||
87 | _eina_bench_rbtree_key(const Eina_Bench_Rbtree *node, | 87 | _eina_bench_rbtree_key(const Eina_Bench_Rbtree *node, |
88 | const char *key, | 88 | const char *key, |
89 | int length, | 89 | int length, |
90 | __UNUSED__ void *data) | 90 | EINA_UNUSED void *data) |
91 | { | 91 | { |
92 | return strncmp(node->key, key, length); | 92 | return strncmp(node->key, key, length); |
93 | } | 93 | } |
94 | 94 | ||
95 | static void | 95 | static void |
96 | _eina_bench_rbtree_free(Eina_Rbtree *node, __UNUSED__ void *data) | 96 | _eina_bench_rbtree_free(Eina_Rbtree *node, EINA_UNUSED void *data) |
97 | { | 97 | { |
98 | free(node); | 98 | free(node); |
99 | } | 99 | } |
diff --git a/src/benchmarks/eina/evas_mempool.c b/src/benchmarks/eina/evas_mempool.c index 7098214647..921b7dfafb 100644 --- a/src/benchmarks/eina/evas_mempool.c +++ b/src/benchmarks/eina/evas_mempool.c | |||
@@ -56,7 +56,7 @@ _evas_mp_pool_free(Pool *p) | |||
56 | } | 56 | } |
57 | 57 | ||
58 | void * | 58 | void * |
59 | evas_mempool_malloc(Evas_Mempool *pool, int size __UNUSED__) | 59 | evas_mempool_malloc(Evas_Mempool *pool, int size EINA_UNUSED) |
60 | { | 60 | { |
61 | #ifdef NOPOOL | 61 | #ifdef NOPOOL |
62 | return malloc(size); | 62 | return malloc(size); |
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am index d7719be5b8..2a2072e451 100644 --- a/src/examples/eo/Makefile.am +++ b/src/examples/eo/Makefile.am | |||
@@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in | |||
2 | 2 | ||
3 | AM_CPPFLAGS = \ | 3 | AM_CPPFLAGS = \ |
4 | -I. \ | 4 | -I. \ |
5 | -I$(top_srcdir)/src/lib/eina \ | ||
5 | -I$(top_srcdir)/src/lib/eo \ | 6 | -I$(top_srcdir)/src/lib/eo \ |
7 | -I$(top_builddir)/src/lib/eina \ | ||
6 | -I$(top_builddir)/src/lib/eo \ | 8 | -I$(top_builddir)/src/lib/eo \ |
7 | @EFL_EO_BUILD@ \ | 9 | @EFL_EO_BUILD@ \ |
8 | @EO_CFLAGS@ | 10 | @EO_CFLAGS@ |
@@ -30,6 +32,8 @@ eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ | |||
30 | 32 | ||
31 | if EO_BUILD_EXAMPLE_EVAS | 33 | if EO_BUILD_EXAMPLE_EVAS |
32 | 34 | ||
35 | AM_CPPFLAGS += @ELM_CFLAGS@ | ||
36 | |||
33 | eo_evas_SOURCES = \ | 37 | eo_evas_SOURCES = \ |
34 | evas/evas_elw_box.c \ | 38 | evas/evas_elw_box.c \ |
35 | evas/evas_elw_box.h \ | 39 | evas/evas_elw_box.h \ |
diff --git a/src/examples/eo/evas/evas_elw_box.c b/src/examples/eo/evas/evas_elw_box.c index 1a2330f845..3efaded84d 100644 --- a/src/examples/eo/evas/evas_elw_box.c +++ b/src/examples/eo/evas/evas_elw_box.c | |||
@@ -5,8 +5,8 @@ | |||
5 | #include <Elementary.h> | 5 | #include <Elementary.h> |
6 | 6 | ||
7 | #include "Eo.h" | 7 | #include "Eo.h" |
8 | #include "evas_obj.h" | 8 | #include "evas_evas_obj.h" |
9 | #include "elw_box.h" | 9 | #include "evas_elw_box.h" |
10 | 10 | ||
11 | EAPI Eo_Op ELW_BOX_BASE_ID = 0; | 11 | EAPI Eo_Op ELW_BOX_BASE_ID = 0; |
12 | 12 | ||
diff --git a/src/examples/eo/evas/evas_elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c index 457dba892a..f6a14640f1 100644 --- a/src/examples/eo/evas/evas_elw_boxedbutton.c +++ b/src/examples/eo/evas/evas_elw_boxedbutton.c | |||
@@ -5,10 +5,10 @@ | |||
5 | #include <Elementary.h> | 5 | #include <Elementary.h> |
6 | 6 | ||
7 | #include "Eo.h" | 7 | #include "Eo.h" |
8 | #include "evas_obj.h" | 8 | #include "evas_evas_obj.h" |
9 | #include "elw_box.h" | 9 | #include "evas_elw_box.h" |
10 | #include "elw_button.h" | 10 | #include "evas_elw_button.h" |
11 | #include "elw_boxedbutton.h" | 11 | #include "evas_elw_boxedbutton.h" |
12 | 12 | ||
13 | typedef struct | 13 | typedef struct |
14 | { | 14 | { |
diff --git a/src/examples/eo/evas/evas_elw_button.c b/src/examples/eo/evas/evas_elw_button.c index 82fa39b354..6ee294f988 100644 --- a/src/examples/eo/evas/evas_elw_button.c +++ b/src/examples/eo/evas/evas_elw_button.c | |||
@@ -5,8 +5,8 @@ | |||
5 | #include <Elementary.h> | 5 | #include <Elementary.h> |
6 | 6 | ||
7 | #include "Eo.h" | 7 | #include "Eo.h" |
8 | #include "evas_obj.h" | 8 | #include "evas_evas_obj.h" |
9 | #include "elw_button.h" | 9 | #include "evas_elw_button.h" |
10 | 10 | ||
11 | EAPI Eo_Op ELW_BUTTON_BASE_ID = 0; | 11 | EAPI Eo_Op ELW_BUTTON_BASE_ID = 0; |
12 | 12 | ||
diff --git a/src/examples/eo/evas/evas_elw_win.c b/src/examples/eo/evas/evas_elw_win.c index dd9e1002f5..25065212e3 100644 --- a/src/examples/eo/evas/evas_elw_win.c +++ b/src/examples/eo/evas/evas_elw_win.c | |||
@@ -5,8 +5,8 @@ | |||
5 | #include <Elementary.h> | 5 | #include <Elementary.h> |
6 | 6 | ||
7 | #include "Eo.h" | 7 | #include "Eo.h" |
8 | #include "evas_obj.h" | 8 | #include "evas_evas_obj.h" |
9 | #include "elw_win.h" | 9 | #include "evas_elw_win.h" |
10 | 10 | ||
11 | typedef struct | 11 | typedef struct |
12 | { | 12 | { |
diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c index 9d13c66813..3d5a1834a9 100644 --- a/src/examples/eo/evas/evas_evas_obj.c +++ b/src/examples/eo/evas/evas_evas_obj.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <Elementary.h> | 5 | #include <Elementary.h> |
6 | 6 | ||
7 | #include "Eo.h" | 7 | #include "Eo.h" |
8 | #include "evas_obj.h" | 8 | #include "evas_evas_obj.h" |
9 | 9 | ||
10 | #define MY_CLASS EXEVAS_OBJ_CLASS | 10 | #define MY_CLASS EXEVAS_OBJ_CLASS |
11 | 11 | ||
diff --git a/src/examples/eo/evas/evas_test.c b/src/examples/eo/evas/evas_test.c index 7a5751367b..1502e31dd1 100644 --- a/src/examples/eo/evas/evas_test.c +++ b/src/examples/eo/evas/evas_test.c | |||
@@ -4,11 +4,11 @@ | |||
4 | 4 | ||
5 | #include <Elementary.h> | 5 | #include <Elementary.h> |
6 | 6 | ||
7 | #include "evas_obj.h" | 7 | #include "evas_evas_obj.h" |
8 | #include "elw_button.h" | 8 | #include "evas_elw_button.h" |
9 | #include "elw_box.h" | 9 | #include "evas_elw_box.h" |
10 | #include "elw_boxedbutton.h" | 10 | #include "evas_elw_boxedbutton.h" |
11 | #include "elw_win.h" | 11 | #include "evas_elw_win.h" |
12 | 12 | ||
13 | Eina_Bool | 13 | Eina_Bool |
14 | _btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) | 14 | _btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) |
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c index f995353161..6cf8a3dbe1 100644 --- a/src/lib/eet/eet_data.c +++ b/src/lib/eet/eet_data.c | |||
@@ -624,7 +624,7 @@ static int _eet_data_words_bigendian = -1; | |||
624 | 624 | ||
625 | /* CHAR TYPE */ | 625 | /* CHAR TYPE */ |
626 | static int | 626 | static int |
627 | eet_data_get_char(const Eet_Dictionary *ed __UNUSED__, | 627 | eet_data_get_char(const Eet_Dictionary *ed EINA_UNUSED, |
628 | const void *src, | 628 | const void *src, |
629 | const void *src_end, | 629 | const void *src_end, |
630 | void *dst) | 630 | void *dst) |
@@ -642,7 +642,7 @@ eet_data_get_char(const Eet_Dictionary *ed __UNUSED__, | |||
642 | } | 642 | } |
643 | 643 | ||
644 | static void * | 644 | static void * |
645 | eet_data_put_char(Eet_Dictionary *ed __UNUSED__, | 645 | eet_data_put_char(Eet_Dictionary *ed EINA_UNUSED, |
646 | const void *src, | 646 | const void *src, |
647 | int *size_ret) | 647 | int *size_ret) |
648 | { | 648 | { |
@@ -661,7 +661,7 @@ eet_data_put_char(Eet_Dictionary *ed __UNUSED__, | |||
661 | 661 | ||
662 | /* SHORT TYPE */ | 662 | /* SHORT TYPE */ |
663 | static int | 663 | static int |
664 | eet_data_get_short(const Eet_Dictionary *ed __UNUSED__, | 664 | eet_data_get_short(const Eet_Dictionary *ed EINA_UNUSED, |
665 | const void *src, | 665 | const void *src, |
666 | const void *src_end, | 666 | const void *src_end, |
667 | void *dst) | 667 | void *dst) |
@@ -678,7 +678,7 @@ eet_data_get_short(const Eet_Dictionary *ed __UNUSED__, | |||
678 | } | 678 | } |
679 | 679 | ||
680 | static void * | 680 | static void * |
681 | eet_data_put_short(Eet_Dictionary *ed __UNUSED__, | 681 | eet_data_put_short(Eet_Dictionary *ed EINA_UNUSED, |
682 | const void *src, | 682 | const void *src, |
683 | int *size_ret) | 683 | int *size_ret) |
684 | { | 684 | { |
@@ -697,7 +697,7 @@ eet_data_put_short(Eet_Dictionary *ed __UNUSED__, | |||
697 | 697 | ||
698 | /* INT TYPE */ | 698 | /* INT TYPE */ |
699 | static inline int | 699 | static inline int |
700 | eet_data_get_int(const Eet_Dictionary *ed __UNUSED__, | 700 | eet_data_get_int(const Eet_Dictionary *ed EINA_UNUSED, |
701 | const void *src, | 701 | const void *src, |
702 | const void *src_end, | 702 | const void *src_end, |
703 | void *dst) | 703 | void *dst) |
@@ -714,7 +714,7 @@ eet_data_get_int(const Eet_Dictionary *ed __UNUSED__, | |||
714 | } | 714 | } |
715 | 715 | ||
716 | static void * | 716 | static void * |
717 | eet_data_put_int(Eet_Dictionary *ed __UNUSED__, | 717 | eet_data_put_int(Eet_Dictionary *ed EINA_UNUSED, |
718 | const void *src, | 718 | const void *src, |
719 | int *size_ret) | 719 | int *size_ret) |
720 | { | 720 | { |
@@ -733,7 +733,7 @@ eet_data_put_int(Eet_Dictionary *ed __UNUSED__, | |||
733 | 733 | ||
734 | /* LONG LONG TYPE */ | 734 | /* LONG LONG TYPE */ |
735 | static int | 735 | static int |
736 | eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__, | 736 | eet_data_get_long_long(const Eet_Dictionary *ed EINA_UNUSED, |
737 | const void *src, | 737 | const void *src, |
738 | const void *src_end, | 738 | const void *src_end, |
739 | void *dst) | 739 | void *dst) |
@@ -750,7 +750,7 @@ eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__, | |||
750 | } | 750 | } |
751 | 751 | ||
752 | static void * | 752 | static void * |
753 | eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__, | 753 | eet_data_put_long_long(Eet_Dictionary *ed EINA_UNUSED, |
754 | const void *src, | 754 | const void *src, |
755 | int *size_ret) | 755 | int *size_ret) |
756 | { | 756 | { |
@@ -863,7 +863,7 @@ eet_data_put_string(Eet_Dictionary *ed, | |||
863 | 863 | ||
864 | /* ALWAYS INLINED STRING TYPE */ | 864 | /* ALWAYS INLINED STRING TYPE */ |
865 | static int | 865 | static int |
866 | eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__, | 866 | eet_data_get_istring(const Eet_Dictionary *ed EINA_UNUSED, |
867 | const void *src, | 867 | const void *src, |
868 | const void *src_end, | 868 | const void *src_end, |
869 | void *dst) | 869 | void *dst) |
@@ -872,7 +872,7 @@ eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__, | |||
872 | } | 872 | } |
873 | 873 | ||
874 | static void * | 874 | static void * |
875 | eet_data_put_istring(Eet_Dictionary *ed __UNUSED__, | 875 | eet_data_put_istring(Eet_Dictionary *ed EINA_UNUSED, |
876 | const void *src, | 876 | const void *src, |
877 | int *size_ret) | 877 | int *size_ret) |
878 | { | 878 | { |
@@ -881,9 +881,9 @@ eet_data_put_istring(Eet_Dictionary *ed __UNUSED__, | |||
881 | 881 | ||
882 | /* ALWAYS NULL TYPE */ | 882 | /* ALWAYS NULL TYPE */ |
883 | static int | 883 | static int |
884 | eet_data_get_null(const Eet_Dictionary *ed __UNUSED__, | 884 | eet_data_get_null(const Eet_Dictionary *ed EINA_UNUSED, |
885 | const void *src __UNUSED__, | 885 | const void *src EINA_UNUSED, |
886 | const void *src_end __UNUSED__, | 886 | const void *src_end EINA_UNUSED, |
887 | void *dst) | 887 | void *dst) |
888 | { | 888 | { |
889 | char **d; | 889 | char **d; |
@@ -895,8 +895,8 @@ eet_data_get_null(const Eet_Dictionary *ed __UNUSED__, | |||
895 | } | 895 | } |
896 | 896 | ||
897 | static void * | 897 | static void * |
898 | eet_data_put_null(Eet_Dictionary *ed __UNUSED__, | 898 | eet_data_put_null(Eet_Dictionary *ed EINA_UNUSED, |
899 | const void *src __UNUSED__, | 899 | const void *src EINA_UNUSED, |
900 | int *size_ret) | 900 | int *size_ret) |
901 | { | 901 | { |
902 | *size_ret = 0; | 902 | *size_ret = 0; |
@@ -1725,7 +1725,7 @@ _eet_str_direct_alloc(const char *str) | |||
1725 | } | 1725 | } |
1726 | 1726 | ||
1727 | static void | 1727 | static void |
1728 | _eet_str_direct_free(const char *str __UNUSED__) | 1728 | _eet_str_direct_free(const char *str EINA_UNUSED) |
1729 | { | 1729 | { |
1730 | } | 1730 | } |
1731 | 1731 | ||
@@ -2512,7 +2512,7 @@ _eet_freelist_all_unref(Eet_Free_Context *freelist_context) | |||
2512 | } | 2512 | } |
2513 | 2513 | ||
2514 | static int | 2514 | static int |
2515 | eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, | 2515 | eet_data_descriptor_encode_hash_cb(void *hash EINA_UNUSED, |
2516 | const char *cipher_key, | 2516 | const char *cipher_key, |
2517 | void *hdata, | 2517 | void *hdata, |
2518 | void *fdata) | 2518 | void *fdata) |
@@ -3506,7 +3506,7 @@ eet_data_get_list(Eet_Free_Context *context, | |||
3506 | Eet_Data_Element *ede, | 3506 | Eet_Data_Element *ede, |
3507 | Eet_Data_Chunk *echnk, | 3507 | Eet_Data_Chunk *echnk, |
3508 | int type, | 3508 | int type, |
3509 | int group_type __UNUSED__, | 3509 | int group_type EINA_UNUSED, |
3510 | void *data, | 3510 | void *data, |
3511 | char **p, | 3511 | char **p, |
3512 | int *size) | 3512 | int *size) |
@@ -3573,7 +3573,7 @@ eet_data_get_hash(Eet_Free_Context *context, | |||
3573 | Eet_Data_Element *ede, | 3573 | Eet_Data_Element *ede, |
3574 | Eet_Data_Chunk *echnk, | 3574 | Eet_Data_Chunk *echnk, |
3575 | int type, | 3575 | int type, |
3576 | int group_type __UNUSED__, | 3576 | int group_type EINA_UNUSED, |
3577 | void *data, | 3577 | void *data, |
3578 | char **p, | 3578 | char **p, |
3579 | int *size) | 3579 | int *size) |
@@ -3817,7 +3817,7 @@ on_error: | |||
3817 | 3817 | ||
3818 | static void | 3818 | static void |
3819 | eet_data_put_union(Eet_Dictionary *ed, | 3819 | eet_data_put_union(Eet_Dictionary *ed, |
3820 | Eet_Data_Descriptor *edd __UNUSED__, | 3820 | Eet_Data_Descriptor *edd EINA_UNUSED, |
3821 | Eet_Data_Element *ede, | 3821 | Eet_Data_Element *ede, |
3822 | Eet_Data_Stream *ds, | 3822 | Eet_Data_Stream *ds, |
3823 | void *data_in) | 3823 | void *data_in) |
@@ -3874,7 +3874,7 @@ eet_data_put_union(Eet_Dictionary *ed, | |||
3874 | static int | 3874 | static int |
3875 | eet_data_get_union(Eet_Free_Context *context, | 3875 | eet_data_get_union(Eet_Free_Context *context, |
3876 | const Eet_Dictionary *ed, | 3876 | const Eet_Dictionary *ed, |
3877 | Eet_Data_Descriptor *edd __UNUSED__, | 3877 | Eet_Data_Descriptor *edd EINA_UNUSED, |
3878 | Eet_Data_Element *ede, | 3878 | Eet_Data_Element *ede, |
3879 | Eet_Data_Chunk *echnk, | 3879 | Eet_Data_Chunk *echnk, |
3880 | int type, | 3880 | int type, |
@@ -3971,7 +3971,7 @@ on_error: | |||
3971 | 3971 | ||
3972 | static void | 3972 | static void |
3973 | eet_data_put_variant(Eet_Dictionary *ed, | 3973 | eet_data_put_variant(Eet_Dictionary *ed, |
3974 | Eet_Data_Descriptor *edd __UNUSED__, | 3974 | Eet_Data_Descriptor *edd EINA_UNUSED, |
3975 | Eet_Data_Element *ede, | 3975 | Eet_Data_Element *ede, |
3976 | Eet_Data_Stream *ds, | 3976 | Eet_Data_Stream *ds, |
3977 | void *data_in) | 3977 | void *data_in) |
@@ -4083,11 +4083,11 @@ eet_data_put_variant(Eet_Dictionary *ed, | |||
4083 | static int | 4083 | static int |
4084 | eet_data_get_variant(Eet_Free_Context *context, | 4084 | eet_data_get_variant(Eet_Free_Context *context, |
4085 | const Eet_Dictionary *ed, | 4085 | const Eet_Dictionary *ed, |
4086 | Eet_Data_Descriptor *edd __UNUSED__, | 4086 | Eet_Data_Descriptor *edd EINA_UNUSED, |
4087 | Eet_Data_Element *ede, | 4087 | Eet_Data_Element *ede, |
4088 | Eet_Data_Chunk *echnk, | 4088 | Eet_Data_Chunk *echnk, |
4089 | int type __UNUSED__, | 4089 | int type EINA_UNUSED, |
4090 | int group_type __UNUSED__, | 4090 | int group_type EINA_UNUSED, |
4091 | void *data, | 4091 | void *data, |
4092 | char **p, | 4092 | char **p, |
4093 | int *size) | 4093 | int *size) |
@@ -4279,10 +4279,10 @@ eet_data_get_unknown(Eet_Free_Context *context, | |||
4279 | Eet_Data_Element *ede, | 4279 | Eet_Data_Element *ede, |
4280 | Eet_Data_Chunk *echnk, | 4280 | Eet_Data_Chunk *echnk, |
4281 | int type, | 4281 | int type, |
4282 | int group_type __UNUSED__, | 4282 | int group_type EINA_UNUSED, |
4283 | void *data, | 4283 | void *data, |
4284 | char **p __UNUSED__, | 4284 | char **p EINA_UNUSED, |
4285 | int *size __UNUSED__) | 4285 | int *size EINA_UNUSED) |
4286 | { | 4286 | { |
4287 | int ret; | 4287 | int ret; |
4288 | void *data_ret; | 4288 | void *data_ret; |
@@ -4390,7 +4390,7 @@ eet_data_get_unknown(Eet_Free_Context *context, | |||
4390 | 4390 | ||
4391 | static void | 4391 | static void |
4392 | eet_data_put_array(Eet_Dictionary *ed, | 4392 | eet_data_put_array(Eet_Dictionary *ed, |
4393 | Eet_Data_Descriptor *edd __UNUSED__, | 4393 | Eet_Data_Descriptor *edd EINA_UNUSED, |
4394 | Eet_Data_Element *ede, | 4394 | Eet_Data_Element *ede, |
4395 | Eet_Data_Stream *ds, | 4395 | Eet_Data_Stream *ds, |
4396 | void *data_in) | 4396 | void *data_in) |
@@ -4466,7 +4466,7 @@ eet_data_put_array(Eet_Dictionary *ed, | |||
4466 | 4466 | ||
4467 | static void | 4467 | static void |
4468 | eet_data_put_unknown(Eet_Dictionary *ed, | 4468 | eet_data_put_unknown(Eet_Dictionary *ed, |
4469 | Eet_Data_Descriptor *edd __UNUSED__, | 4469 | Eet_Data_Descriptor *edd EINA_UNUSED, |
4470 | Eet_Data_Element *ede, | 4470 | Eet_Data_Element *ede, |
4471 | Eet_Data_Stream *ds, | 4471 | Eet_Data_Stream *ds, |
4472 | void *data_in) | 4472 | void *data_in) |
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c index 7116a3cd33..149fa1aa27 100644 --- a/src/lib/eet/eet_image.c +++ b/src/lib/eet/eet_image.c | |||
@@ -342,7 +342,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo) | |||
342 | } | 342 | } |
343 | 343 | ||
344 | static void | 344 | static void |
345 | _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) | 345 | _JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED) |
346 | { | 346 | { |
347 | /* emptr errmgr; */ | 347 | /* emptr errmgr; */ |
348 | 348 | ||
@@ -353,8 +353,8 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) | |||
353 | } | 353 | } |
354 | 354 | ||
355 | static void | 355 | static void |
356 | _JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, | 356 | _JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED, |
357 | int msg_level __UNUSED__) | 357 | int msg_level EINA_UNUSED) |
358 | { | 358 | { |
359 | /* emptr errmgr; */ | 359 | /* emptr errmgr; */ |
360 | 360 | ||
diff --git a/src/lib/eina/eina_file.c b/src/lib/eina/eina_file.c index d34f917b1b..ea382d73cc 100644 --- a/src/lib/eina/eina_file.c +++ b/src/lib/eina/eina_file.c | |||
@@ -402,21 +402,21 @@ _eina_file_map_close(Eina_File_Map *map) | |||
402 | } | 402 | } |
403 | 403 | ||
404 | static unsigned int | 404 | static unsigned int |
405 | _eina_file_map_key_length(const void *key __UNUSED__) | 405 | _eina_file_map_key_length(const void *key EINA_UNUSED) |
406 | { | 406 | { |
407 | return sizeof (unsigned long int) * 2; | 407 | return sizeof (unsigned long int) * 2; |
408 | } | 408 | } |
409 | 409 | ||
410 | static int | 410 | static int |
411 | _eina_file_map_key_cmp(const unsigned long int *key1, int key1_length __UNUSED__, | 411 | _eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED, |
412 | const unsigned long int *key2, int key2_length __UNUSED__) | 412 | const unsigned long int *key2, int key2_length EINA_UNUSED) |
413 | { | 413 | { |
414 | if (key1[0] - key2[0] == 0) return key1[1] - key2[1]; | 414 | if (key1[0] - key2[0] == 0) return key1[1] - key2[1]; |
415 | return key1[0] - key2[0]; | 415 | return key1[0] - key2[0]; |
416 | } | 416 | } |
417 | 417 | ||
418 | static int | 418 | static int |
419 | _eina_file_map_key_hash(const unsigned long int *key, int key_length __UNUSED__) | 419 | _eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED) |
420 | { | 420 | { |
421 | return eina_hash_int64(&key[0], sizeof (unsigned long int)) | 421 | return eina_hash_int64(&key[0], sizeof (unsigned long int)) |
422 | ^ eina_hash_int64(&key[1], sizeof (unsigned long int)); | 422 | ^ eina_hash_int64(&key[1], sizeof (unsigned long int)); |
diff --git a/src/lib/eina/eina_file_win32.c b/src/lib/eina/eina_file_win32.c index 61bd0d19ea..927ca7758c 100644 --- a/src/lib/eina/eina_file_win32.c +++ b/src/lib/eina/eina_file_win32.c | |||
@@ -469,21 +469,21 @@ _eina_file_map_close(Eina_File_Map *map) | |||
469 | } | 469 | } |
470 | 470 | ||
471 | static unsigned int | 471 | static unsigned int |
472 | _eina_file_map_key_length(const void *key __UNUSED__) | 472 | _eina_file_map_key_length(const void *key EINA_UNUSED) |
473 | { | 473 | { |
474 | return sizeof (unsigned long int) * 2; | 474 | return sizeof (unsigned long int) * 2; |
475 | } | 475 | } |
476 | 476 | ||
477 | static int | 477 | static int |
478 | _eina_file_map_key_cmp(const unsigned long int *key1, int key1_length __UNUSED__, | 478 | _eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED, |
479 | const unsigned long int *key2, int key2_length __UNUSED__) | 479 | const unsigned long int *key2, int key2_length EINA_UNUSED) |
480 | { | 480 | { |
481 | if (key1[0] - key2[0] == 0) return key1[1] - key2[1]; | 481 | if (key1[0] - key2[0] == 0) return key1[1] - key2[1]; |
482 | return key1[0] - key2[0]; | 482 | return key1[0] - key2[0]; |
483 | } | 483 | } |
484 | 484 | ||
485 | static int | 485 | static int |
486 | _eina_file_map_key_hash(const unsigned long int *key, int key_length __UNUSED__) | 486 | _eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED) |
487 | { | 487 | { |
488 | return eina_hash_int64(&key[0], sizeof (unsigned long int)) | 488 | return eina_hash_int64(&key[0], sizeof (unsigned long int)) |
489 | ^ eina_hash_int64(&key[1], sizeof (unsigned long int)); | 489 | ^ eina_hash_int64(&key[1], sizeof (unsigned long int)); |
@@ -1122,18 +1122,18 @@ eina_file_filename_get(Eina_File *file) | |||
1122 | return file->filename; | 1122 | return file->filename; |
1123 | } | 1123 | } |
1124 | 1124 | ||
1125 | EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file __UNUSED__) | 1125 | EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file EINA_UNUSED) |
1126 | { | 1126 | { |
1127 | return NULL; | 1127 | return NULL; |
1128 | } | 1128 | } |
1129 | 1129 | ||
1130 | EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file __UNUSED__) | 1130 | EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file EINA_UNUSED) |
1131 | { | 1131 | { |
1132 | return NULL; | 1132 | return NULL; |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | EAPI void * | 1135 | EAPI void * |
1136 | eina_file_map_all(Eina_File *file, Eina_File_Populate rule __UNUSED__) | 1136 | eina_file_map_all(Eina_File *file, Eina_File_Populate rule EINA_UNUSED) |
1137 | { | 1137 | { |
1138 | EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL); | 1138 | EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL); |
1139 | 1139 | ||
@@ -1342,7 +1342,7 @@ eina_file_map_faulted(Eina_File *file, void *map) | |||
1342 | } | 1342 | } |
1343 | 1343 | ||
1344 | EAPI int | 1344 | EAPI int |
1345 | eina_file_statat(void *container __UNUSED__, Eina_File_Direct_Info *info, Eina_Stat *st) | 1345 | eina_file_statat(void *container EINA_UNUSED, Eina_File_Direct_Info *info, Eina_Stat *st) |
1346 | { | 1346 | { |
1347 | struct __stat64 buf; | 1347 | struct __stat64 buf; |
1348 | 1348 | ||
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c index 821d2254d6..594d54ac40 100644 --- a/src/lib/eina/eina_hash.c +++ b/src/lib/eina/eina_hash.c | |||
@@ -156,8 +156,8 @@ struct _Eina_Hash_Each | |||
156 | static inline int | 156 | static inline int |
157 | _eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head, | 157 | _eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head, |
158 | const int *hash, | 158 | const int *hash, |
159 | __UNUSED__ int key_length, | 159 | EINA_UNUSED int key_length, |
160 | __UNUSED__ void *data) | 160 | EINA_UNUSED void *data) |
161 | { | 161 | { |
162 | return hash_head->hash - *hash; | 162 | return hash_head->hash - *hash; |
163 | } | 163 | } |
@@ -165,7 +165,7 @@ _eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head, | |||
165 | static Eina_Rbtree_Direction | 165 | static Eina_Rbtree_Direction |
166 | _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left, | 166 | _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left, |
167 | const Eina_Hash_Head *right, | 167 | const Eina_Hash_Head *right, |
168 | __UNUSED__ void *data) | 168 | EINA_UNUSED void *data) |
169 | { | 169 | { |
170 | if (left->hash - right->hash < 0) | 170 | if (left->hash - right->hash < 0) |
171 | return EINA_RBTREE_LEFT; | 171 | return EINA_RBTREE_LEFT; |
@@ -176,7 +176,7 @@ _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left, | |||
176 | static inline int | 176 | static inline int |
177 | _eina_hash_key_rbtree_cmp_key_data(const Eina_Hash_Element *hash_element, | 177 | _eina_hash_key_rbtree_cmp_key_data(const Eina_Hash_Element *hash_element, |
178 | const Eina_Hash_Tuple *tuple, | 178 | const Eina_Hash_Tuple *tuple, |
179 | __UNUSED__ unsigned int key_length, | 179 | EINA_UNUSED unsigned int key_length, |
180 | Eina_Key_Cmp cmp) | 180 | Eina_Key_Cmp cmp) |
181 | { | 181 | { |
182 | int result; | 182 | int result; |
@@ -307,7 +307,7 @@ on_error: | |||
307 | } | 307 | } |
308 | 308 | ||
309 | static Eina_Bool | 309 | static Eina_Bool |
310 | _eina_hash_rbtree_each(__UNUSED__ const Eina_Rbtree *container, | 310 | _eina_hash_rbtree_each(EINA_UNUSED const Eina_Rbtree *container, |
311 | const Eina_Hash_Head *hash_head, | 311 | const Eina_Hash_Head *hash_head, |
312 | Eina_Hash_Each *data) | 312 | Eina_Hash_Each *data) |
313 | { | 313 | { |
@@ -507,41 +507,41 @@ _eina_string_key_length(const char *key) | |||
507 | } | 507 | } |
508 | 508 | ||
509 | static int | 509 | static int |
510 | _eina_string_key_cmp(const char *key1, __UNUSED__ int key1_length, | 510 | _eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length, |
511 | const char *key2, __UNUSED__ int key2_length) | 511 | const char *key2, EINA_UNUSED int key2_length) |
512 | { | 512 | { |
513 | return strcmp(key1, key2); | 513 | return strcmp(key1, key2); |
514 | } | 514 | } |
515 | 515 | ||
516 | static int | 516 | static int |
517 | _eina_stringshared_key_cmp(const char *key1, __UNUSED__ int key1_length, | 517 | _eina_stringshared_key_cmp(const char *key1, EINA_UNUSED int key1_length, |
518 | const char *key2, __UNUSED__ int key2_length) | 518 | const char *key2, EINA_UNUSED int key2_length) |
519 | { | 519 | { |
520 | return key1 - key2; | 520 | return key1 - key2; |
521 | } | 521 | } |
522 | 522 | ||
523 | static unsigned int | 523 | static unsigned int |
524 | _eina_int32_key_length(__UNUSED__ const uint32_t *key) | 524 | _eina_int32_key_length(EINA_UNUSED const uint32_t *key) |
525 | { | 525 | { |
526 | return 4; | 526 | return 4; |
527 | } | 527 | } |
528 | 528 | ||
529 | static int | 529 | static int |
530 | _eina_int32_key_cmp(const uint32_t *key1, __UNUSED__ int key1_length, | 530 | _eina_int32_key_cmp(const uint32_t *key1, EINA_UNUSED int key1_length, |
531 | const uint32_t *key2, __UNUSED__ int key2_length) | 531 | const uint32_t *key2, EINA_UNUSED int key2_length) |
532 | { | 532 | { |
533 | return *key1 - *key2; | 533 | return *key1 - *key2; |
534 | } | 534 | } |
535 | 535 | ||
536 | static unsigned int | 536 | static unsigned int |
537 | _eina_int64_key_length(__UNUSED__ const uint32_t *key) | 537 | _eina_int64_key_length(EINA_UNUSED const uint32_t *key) |
538 | { | 538 | { |
539 | return 8; | 539 | return 8; |
540 | } | 540 | } |
541 | 541 | ||
542 | static int | 542 | static int |
543 | _eina_int64_key_cmp(const uint64_t *key1, __UNUSED__ int key1_length, | 543 | _eina_int64_key_cmp(const uint64_t *key1, EINA_UNUSED int key1_length, |
544 | const uint64_t *key2, __UNUSED__ int key2_length) | 544 | const uint64_t *key2, EINA_UNUSED int key2_length) |
545 | { | 545 | { |
546 | return *key1 - *key2; | 546 | return *key1 - *key2; |
547 | } | 547 | } |
diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c index 7ef219def9..01871b20f8 100644 --- a/src/lib/eina/eina_list.c +++ b/src/lib/eina/eina_list.c | |||
@@ -168,7 +168,7 @@ static int _eina_list_log_dom = -1; | |||
168 | #define DBG(...) EINA_LOG_DOM_DBG(_eina_list_log_dom, __VA_ARGS__) | 168 | #define DBG(...) EINA_LOG_DOM_DBG(_eina_list_log_dom, __VA_ARGS__) |
169 | 169 | ||
170 | static inline Eina_List_Accounting * | 170 | static inline Eina_List_Accounting * |
171 | _eina_list_mempool_accounting_new(__UNUSED__ Eina_List *list) | 171 | _eina_list_mempool_accounting_new(EINA_UNUSED Eina_List *list) |
172 | { | 172 | { |
173 | Eina_List_Accounting *tmp; | 173 | Eina_List_Accounting *tmp; |
174 | 174 | ||
@@ -192,7 +192,7 @@ _eina_list_mempool_accounting_free(Eina_List_Accounting *accounting) | |||
192 | } | 192 | } |
193 | 193 | ||
194 | static inline Eina_List * | 194 | static inline Eina_List * |
195 | _eina_list_mempool_list_new(__UNUSED__ Eina_List *list) | 195 | _eina_list_mempool_list_new(EINA_UNUSED Eina_List *list) |
196 | { | 196 | { |
197 | Eina_List *tmp; | 197 | Eina_List *tmp; |
198 | 198 | ||
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index 4316eae30a..bd2e52d32b 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c | |||
@@ -467,9 +467,9 @@ static void | |||
467 | eina_log_print_prefix_NOthreads_NOcolor_NOfile_func(FILE *fp, | 467 | eina_log_print_prefix_NOthreads_NOcolor_NOfile_func(FILE *fp, |
468 | const Eina_Log_Domain *d, | 468 | const Eina_Log_Domain *d, |
469 | Eina_Log_Level level, | 469 | Eina_Log_Level level, |
470 | const char *file __UNUSED__, | 470 | const char *file EINA_UNUSED, |
471 | const char *fnc, | 471 | const char *fnc, |
472 | int line __UNUSED__) | 472 | int line EINA_UNUSED) |
473 | { | 473 | { |
474 | DECLARE_LEVEL_NAME(level); | 474 | DECLARE_LEVEL_NAME(level); |
475 | fprintf(fp, "%s<%u>:%s %s() ", name, eina_log_pid_get(), d->domain_str, | 475 | fprintf(fp, "%s<%u>:%s %s() ", name, eina_log_pid_get(), d->domain_str, |
@@ -481,7 +481,7 @@ eina_log_print_prefix_NOthreads_NOcolor_file_NOfunc(FILE *fp, | |||
481 | const Eina_Log_Domain *d, | 481 | const Eina_Log_Domain *d, |
482 | Eina_Log_Level level, | 482 | Eina_Log_Level level, |
483 | const char *file, | 483 | const char *file, |
484 | const char *fnc __UNUSED__, | 484 | const char *fnc EINA_UNUSED, |
485 | int line) | 485 | int line) |
486 | { | 486 | { |
487 | DECLARE_LEVEL_NAME(level); | 487 | DECLARE_LEVEL_NAME(level); |
@@ -535,9 +535,9 @@ static void | |||
535 | eina_log_print_prefix_NOthreads_color_NOfile_func(FILE *fp, | 535 | eina_log_print_prefix_NOthreads_color_NOfile_func(FILE *fp, |
536 | const Eina_Log_Domain *d, | 536 | const Eina_Log_Domain *d, |
537 | Eina_Log_Level level, | 537 | Eina_Log_Level level, |
538 | const char *file __UNUSED__, | 538 | const char *file EINA_UNUSED, |
539 | const char *fnc, | 539 | const char *fnc, |
540 | int line __UNUSED__) | 540 | int line EINA_UNUSED) |
541 | { | 541 | { |
542 | DECLARE_LEVEL_NAME_COLOR(level); | 542 | DECLARE_LEVEL_NAME_COLOR(level); |
543 | #ifdef _WIN32_WCE | 543 | #ifdef _WIN32_WCE |
@@ -574,7 +574,7 @@ eina_log_print_prefix_NOthreads_color_file_NOfunc(FILE *fp, | |||
574 | const Eina_Log_Domain *d, | 574 | const Eina_Log_Domain *d, |
575 | Eina_Log_Level level, | 575 | Eina_Log_Level level, |
576 | const char *file, | 576 | const char *file, |
577 | const char *fnc __UNUSED__, | 577 | const char *fnc EINA_UNUSED, |
578 | int line) | 578 | int line) |
579 | { | 579 | { |
580 | DECLARE_LEVEL_NAME_COLOR(level); | 580 | DECLARE_LEVEL_NAME_COLOR(level); |
@@ -630,9 +630,9 @@ static void | |||
630 | eina_log_print_prefix_threads_NOcolor_NOfile_func(FILE *fp, | 630 | eina_log_print_prefix_threads_NOcolor_NOfile_func(FILE *fp, |
631 | const Eina_Log_Domain *d, | 631 | const Eina_Log_Domain *d, |
632 | Eina_Log_Level level, | 632 | Eina_Log_Level level, |
633 | const char *file __UNUSED__, | 633 | const char *file EINA_UNUSED, |
634 | const char *fnc, | 634 | const char *fnc, |
635 | int line __UNUSED__) | 635 | int line EINA_UNUSED) |
636 | { | 636 | { |
637 | Thread cur; | 637 | Thread cur; |
638 | 638 | ||
@@ -654,7 +654,7 @@ eina_log_print_prefix_threads_NOcolor_file_NOfunc(FILE *fp, | |||
654 | const Eina_Log_Domain *d, | 654 | const Eina_Log_Domain *d, |
655 | Eina_Log_Level level, | 655 | Eina_Log_Level level, |
656 | const char *file, | 656 | const char *file, |
657 | const char *fnc __UNUSED__, | 657 | const char *fnc EINA_UNUSED, |
658 | int line) | 658 | int line) |
659 | { | 659 | { |
660 | Thread cur; | 660 | Thread cur; |
@@ -752,9 +752,9 @@ static void | |||
752 | eina_log_print_prefix_threads_color_NOfile_func(FILE *fp, | 752 | eina_log_print_prefix_threads_color_NOfile_func(FILE *fp, |
753 | const Eina_Log_Domain *d, | 753 | const Eina_Log_Domain *d, |
754 | Eina_Log_Level level, | 754 | Eina_Log_Level level, |
755 | const char *file __UNUSED__, | 755 | const char *file EINA_UNUSED, |
756 | const char *fnc, | 756 | const char *fnc, |
757 | int line __UNUSED__) | 757 | int line EINA_UNUSED) |
758 | { | 758 | { |
759 | Thread cur; | 759 | Thread cur; |
760 | 760 | ||
@@ -822,7 +822,7 @@ eina_log_print_prefix_threads_color_file_NOfunc(FILE *fp, | |||
822 | const Eina_Log_Domain *d, | 822 | const Eina_Log_Domain *d, |
823 | Eina_Log_Level level, | 823 | Eina_Log_Level level, |
824 | const char *file, | 824 | const char *file, |
825 | const char *fnc __UNUSED__, | 825 | const char *fnc EINA_UNUSED, |
826 | int line) | 826 | int line) |
827 | { | 827 | { |
828 | Thread cur; | 828 | Thread cur; |
@@ -1887,7 +1887,7 @@ eina_log_print_cb_stderr(const Eina_Log_Domain *d, | |||
1887 | const char *fnc, | 1887 | const char *fnc, |
1888 | int line, | 1888 | int line, |
1889 | const char *fmt, | 1889 | const char *fmt, |
1890 | __UNUSED__ void *data, | 1890 | EINA_UNUSED void *data, |
1891 | va_list args) | 1891 | va_list args) |
1892 | { | 1892 | { |
1893 | #ifdef EINA_ENABLE_LOG | 1893 | #ifdef EINA_ENABLE_LOG |
@@ -1914,7 +1914,7 @@ eina_log_print_cb_stdout(const Eina_Log_Domain *d, | |||
1914 | const char *fnc, | 1914 | const char *fnc, |
1915 | int line, | 1915 | int line, |
1916 | const char *fmt, | 1916 | const char *fmt, |
1917 | __UNUSED__ void *data, | 1917 | EINA_UNUSED void *data, |
1918 | va_list args) | 1918 | va_list args) |
1919 | { | 1919 | { |
1920 | #ifdef EINA_ENABLE_LOG | 1920 | #ifdef EINA_ENABLE_LOG |
@@ -1936,7 +1936,7 @@ eina_log_print_cb_stdout(const Eina_Log_Domain *d, | |||
1936 | 1936 | ||
1937 | EAPI void | 1937 | EAPI void |
1938 | eina_log_print_cb_file(const Eina_Log_Domain *d, | 1938 | eina_log_print_cb_file(const Eina_Log_Domain *d, |
1939 | __UNUSED__ Eina_Log_Level level, | 1939 | EINA_UNUSED Eina_Log_Level level, |
1940 | const char *file, | 1940 | const char *file, |
1941 | const char *fnc, | 1941 | const char *fnc, |
1942 | int line, | 1942 | int line, |
diff --git a/src/lib/eina/eina_mmap.c b/src/lib/eina/eina_mmap.c index 90809a23bb..0c4dec6b4b 100644 --- a/src/lib/eina/eina_mmap.c +++ b/src/lib/eina/eina_mmap.c | |||
@@ -76,9 +76,9 @@ static long _eina_mmap_pagesize = -1; | |||
76 | #define DBG(...) EINA_LOG_DOM_DBG(_eina_mmap_log_dom, __VA_ARGS__) | 76 | #define DBG(...) EINA_LOG_DOM_DBG(_eina_mmap_log_dom, __VA_ARGS__) |
77 | 77 | ||
78 | static void | 78 | static void |
79 | _eina_mmap_safe_sigbus(int sig __UNUSED__, | 79 | _eina_mmap_safe_sigbus(int sig EINA_UNUSED, |
80 | siginfo_t *siginfo, | 80 | siginfo_t *siginfo, |
81 | void *ptr __UNUSED__) | 81 | void *ptr EINA_UNUSED) |
82 | { | 82 | { |
83 | unsigned char *addr = (unsigned char *)(siginfo->si_addr); | 83 | unsigned char *addr = (unsigned char *)(siginfo->si_addr); |
84 | int perrno; | 84 | int perrno; |
diff --git a/src/lib/eina/eina_model.c b/src/lib/eina/eina_model.c index 22ca71867e..16293284ca 100644 --- a/src/lib/eina/eina_model.c +++ b/src/lib/eina/eina_model.c | |||
@@ -2465,7 +2465,7 @@ _eina_model_interface_properties_hash_constructor(Eina_Model *model) | |||
2465 | } | 2465 | } |
2466 | 2466 | ||
2467 | static Eina_Bool | 2467 | static Eina_Bool |
2468 | _eina_model_interface_properties_hash_destructor_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) | 2468 | _eina_model_interface_properties_hash_destructor_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) |
2469 | { | 2469 | { |
2470 | eina_value_free(data); | 2470 | eina_value_free(data); |
2471 | return EINA_TRUE; | 2471 | return EINA_TRUE; |
@@ -2551,7 +2551,7 @@ _eina_model_interface_properties_hash_del(Eina_Model *model, const char *name) | |||
2551 | } | 2551 | } |
2552 | 2552 | ||
2553 | static Eina_Bool | 2553 | static Eina_Bool |
2554 | _eina_model_interface_properties_hash_names_list_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata) | 2554 | _eina_model_interface_properties_hash_names_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata) |
2555 | { | 2555 | { |
2556 | Eina_List **p_list = fdata; | 2556 | Eina_List **p_list = fdata; |
2557 | *p_list = eina_list_append(*p_list, eina_stringshare_add(key)); | 2557 | *p_list = eina_list_append(*p_list, eina_stringshare_add(key)); |
@@ -2686,7 +2686,7 @@ _eina_model_interface_properties_struct_set(Eina_Model *model, const char *name, | |||
2686 | } | 2686 | } |
2687 | 2687 | ||
2688 | static Eina_Bool | 2688 | static Eina_Bool |
2689 | _eina_model_interface_properties_struct_del(Eina_Model *model __UNUSED__, const char *name __UNUSED__) | 2689 | _eina_model_interface_properties_struct_del(Eina_Model *model EINA_UNUSED, const char *name EINA_UNUSED) |
2690 | { | 2690 | { |
2691 | return EINA_FALSE; /* not allowed */ | 2691 | return EINA_FALSE; /* not allowed */ |
2692 | } | 2692 | } |
@@ -4888,7 +4888,7 @@ eina_model_type_subclass_check(const Eina_Model_Type *type, const Eina_Model_Typ | |||
4888 | } | 4888 | } |
4889 | 4889 | ||
4890 | static inline const Eina_Model_Interface * | 4890 | static inline const Eina_Model_Interface * |
4891 | _eina_model_type_interface_get(const Eina_Model_Type *type, const char *name, Eina_Bool ptr_cmp __UNUSED__) | 4891 | _eina_model_type_interface_get(const Eina_Model_Type *type, const char *name, Eina_Bool ptr_cmp EINA_UNUSED) |
4892 | { | 4892 | { |
4893 | const Eina_Model_Interface **itr; | 4893 | const Eina_Model_Interface **itr; |
4894 | 4894 | ||
diff --git a/src/lib/eina/eina_object.c b/src/lib/eina/eina_object.c index f82aef39ba..218c9e0d44 100644 --- a/src/lib/eina/eina_object.c +++ b/src/lib/eina/eina_object.c | |||
@@ -176,7 +176,7 @@ static unsigned int _eina_object_item_size = 0; | |||
176 | 176 | ||
177 | static int | 177 | static int |
178 | _eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key, | 178 | _eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key, |
179 | __UNUSED__ int length, __UNUSED__ void *data) | 179 | EINA_UNUSED int length, EINA_UNUSED void *data) |
180 | { | 180 | { |
181 | Eina_Class_Range *range; | 181 | Eina_Class_Range *range; |
182 | Eina_Object_ID id; | 182 | Eina_Object_ID id; |
@@ -192,7 +192,7 @@ _eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key, | |||
192 | static Eina_Rbtree_Direction | 192 | static Eina_Rbtree_Direction |
193 | _eina_class_direction_range(const Eina_Rbtree *left, | 193 | _eina_class_direction_range(const Eina_Rbtree *left, |
194 | const Eina_Rbtree *right, | 194 | const Eina_Rbtree *right, |
195 | __UNUSED__ void *data) | 195 | EINA_UNUSED void *data) |
196 | { | 196 | { |
197 | Eina_Class_Range *rl; | 197 | Eina_Class_Range *rl; |
198 | Eina_Class_Range *rr; | 198 | Eina_Class_Range *rr; |
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c index 91ad0dbafd..c68e399cc9 100644 --- a/src/lib/eina/eina_share_common.c +++ b/src/lib/eina/eina_share_common.c | |||
@@ -305,31 +305,31 @@ _eina_share_common_population_head_del(Eina_Share *share, | |||
305 | 305 | ||
306 | #else /* EINA_SHARE_COMMON_USAGE undefined */ | 306 | #else /* EINA_SHARE_COMMON_USAGE undefined */ |
307 | 307 | ||
308 | static void _eina_share_common_population_init(__UNUSED__ Eina_Share *share) { | 308 | static void _eina_share_common_population_init(EINA_UNUSED Eina_Share *share) { |
309 | } | 309 | } |
310 | static void _eina_share_common_population_shutdown(__UNUSED__ Eina_Share *share) | 310 | static void _eina_share_common_population_shutdown(EINA_UNUSED Eina_Share *share) |
311 | { | 311 | { |
312 | } | 312 | } |
313 | static void _eina_share_common_population_stats(__UNUSED__ Eina_Share *share) { | 313 | static void _eina_share_common_population_stats(EINA_UNUSED Eina_Share *share) { |
314 | } | 314 | } |
315 | void eina_share_common_population_add(__UNUSED__ Eina_Share *share, | 315 | void eina_share_common_population_add(EINA_UNUSED Eina_Share *share, |
316 | __UNUSED__ int slen) { | 316 | EINA_UNUSED int slen) { |
317 | } | 317 | } |
318 | void eina_share_common_population_del(__UNUSED__ Eina_Share *share, | 318 | void eina_share_common_population_del(EINA_UNUSED Eina_Share *share, |
319 | __UNUSED__ int slen) { | 319 | EINA_UNUSED int slen) { |
320 | } | 320 | } |
321 | static void _eina_share_common_population_head_init( | 321 | static void _eina_share_common_population_head_init( |
322 | __UNUSED__ Eina_Share *share, | 322 | EINA_UNUSED Eina_Share *share, |
323 | __UNUSED__ Eina_Share_Common_Head *head) { | 323 | EINA_UNUSED Eina_Share_Common_Head *head) { |
324 | } | 324 | } |
325 | static void _eina_share_common_population_head_add( | 325 | static void _eina_share_common_population_head_add( |
326 | __UNUSED__ Eina_Share *share, | 326 | EINA_UNUSED Eina_Share *share, |
327 | __UNUSED__ | 327 | EINA_UNUSED |
328 | Eina_Share_Common_Head *head) { | 328 | Eina_Share_Common_Head *head) { |
329 | } | 329 | } |
330 | static void _eina_share_common_population_head_del( | 330 | static void _eina_share_common_population_head_del( |
331 | __UNUSED__ Eina_Share *share, | 331 | EINA_UNUSED Eina_Share *share, |
332 | __UNUSED__ | 332 | EINA_UNUSED |
333 | Eina_Share_Common_Head *head) { | 333 | Eina_Share_Common_Head *head) { |
334 | } | 334 | } |
335 | #endif | 335 | #endif |
@@ -337,8 +337,8 @@ static void _eina_share_common_population_head_del( | |||
337 | static int | 337 | static int |
338 | _eina_share_common_cmp(const Eina_Share_Common_Head *ed, | 338 | _eina_share_common_cmp(const Eina_Share_Common_Head *ed, |
339 | const int *hash, | 339 | const int *hash, |
340 | __UNUSED__ int length, | 340 | EINA_UNUSED int length, |
341 | __UNUSED__ void *data) | 341 | EINA_UNUSED void *data) |
342 | { | 342 | { |
343 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, , 0); | 343 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, , 0); |
344 | 344 | ||
@@ -348,7 +348,7 @@ _eina_share_common_cmp(const Eina_Share_Common_Head *ed, | |||
348 | static Eina_Rbtree_Direction | 348 | static Eina_Rbtree_Direction |
349 | _eina_share_common_node(const Eina_Share_Common_Head *left, | 349 | _eina_share_common_node(const Eina_Share_Common_Head *left, |
350 | const Eina_Share_Common_Head *right, | 350 | const Eina_Share_Common_Head *right, |
351 | __UNUSED__ void *data) | 351 | EINA_UNUSED void *data) |
352 | { | 352 | { |
353 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(left, , 0); | 353 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(left, , 0); |
354 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(right, , 0); | 354 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(right, , 0); |
@@ -360,7 +360,7 @@ _eina_share_common_node(const Eina_Share_Common_Head *left, | |||
360 | } | 360 | } |
361 | 361 | ||
362 | static void | 362 | static void |
363 | _eina_share_common_head_free(Eina_Share_Common_Head *ed, __UNUSED__ void *data) | 363 | _eina_share_common_head_free(Eina_Share_Common_Head *ed, EINA_UNUSED void *data) |
364 | { | 364 | { |
365 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, ); | 365 | EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, ); |
366 | 366 | ||
@@ -546,7 +546,7 @@ _eina_share_common_node_from_str(const char *str, Eina_Magic node_magic) | |||
546 | } | 546 | } |
547 | 547 | ||
548 | static Eina_Bool | 548 | static Eina_Bool |
549 | eina_iterator_array_check(const Eina_Rbtree *rbtree __UNUSED__, | 549 | eina_iterator_array_check(const Eina_Rbtree *rbtree EINA_UNUSED, |
550 | Eina_Share_Common_Head *head, | 550 | Eina_Share_Common_Head *head, |
551 | struct dumpinfo *fdata) | 551 | struct dumpinfo *fdata) |
552 | { | 552 | { |
@@ -867,7 +867,7 @@ on_error: | |||
867 | } | 867 | } |
868 | 868 | ||
869 | int | 869 | int |
870 | eina_share_common_length(__UNUSED__ Eina_Share *share, const char *str) | 870 | eina_share_common_length(EINA_UNUSED Eina_Share *share, const char *str) |
871 | { | 871 | { |
872 | const Eina_Share_Common_Node *node; | 872 | const Eina_Share_Common_Node *node; |
873 | 873 | ||
diff --git a/src/lib/eina/eina_str.c b/src/lib/eina/eina_str.c index 5db38394bb..65389c7cd4 100644 --- a/src/lib/eina/eina_str.c +++ b/src/lib/eina/eina_str.c | |||
@@ -514,9 +514,9 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text) | |||
514 | } | 514 | } |
515 | #else | 515 | #else |
516 | EAPI char * | 516 | EAPI char * |
517 | eina_str_convert(const char *enc_from __UNUSED__, | 517 | eina_str_convert(const char *enc_from EINA_UNUSED, |
518 | const char *enc_to __UNUSED__, | 518 | const char *enc_to EINA_UNUSED, |
519 | const char *text __UNUSED__) | 519 | const char *text EINA_UNUSED) |
520 | { | 520 | { |
521 | return NULL; | 521 | return NULL; |
522 | } | 522 | } |
diff --git a/src/lib/eina/eina_strbuf_common.c b/src/lib/eina/eina_strbuf_common.c index 64c2c14185..31ad6832c4 100644 --- a/src/lib/eina/eina_strbuf_common.c +++ b/src/lib/eina/eina_strbuf_common.c | |||
@@ -109,7 +109,7 @@ _eina_strbuf_common_init(size_t csize, Eina_Strbuf *buf) | |||
109 | * @return #EINA_TRUE on success, #EINA_FALSE on failure. | 109 | * @return #EINA_TRUE on success, #EINA_FALSE on failure. |
110 | */ | 110 | */ |
111 | static Eina_Bool | 111 | static Eina_Bool |
112 | _eina_strbuf_common_manage_init(size_t csize __UNUSED__, | 112 | _eina_strbuf_common_manage_init(size_t csize EINA_UNUSED, |
113 | Eina_Strbuf *buf, | 113 | Eina_Strbuf *buf, |
114 | void *str, | 114 | void *str, |
115 | size_t len) | 115 | size_t len) |
diff --git a/src/lib/eina/eina_tiler.c b/src/lib/eina/eina_tiler.c index b436ba6583..2afb4f7a20 100644 --- a/src/lib/eina/eina_tiler.c +++ b/src/lib/eina/eina_tiler.c | |||
@@ -997,8 +997,8 @@ static inline void _splitter_del(Eina_Tiler *t) | |||
997 | } | 997 | } |
998 | 998 | ||
999 | static inline void _splitter_tile_size_set(Eina_Tiler *t, | 999 | static inline void _splitter_tile_size_set(Eina_Tiler *t, |
1000 | int w __UNUSED__, | 1000 | int w EINA_UNUSED, |
1001 | int h __UNUSED__) | 1001 | int h EINA_UNUSED) |
1002 | { | 1002 | { |
1003 | /* TODO are w and h used for something? */ | 1003 | /* TODO are w and h used for something? */ |
1004 | t->splitter.rects = list_zeroed; | 1004 | t->splitter.rects = list_zeroed; |
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h index 9e3a6f1537..d74d200a32 100644 --- a/src/lib/eina/eina_types.h +++ b/src/lib/eina/eina_types.h | |||
@@ -164,10 +164,11 @@ | |||
164 | # define EINA_SENTINEL | 164 | # define EINA_SENTINEL |
165 | # endif | 165 | # endif |
166 | 166 | ||
167 | #elif defined(_WIN32) | 167 | #elif defined(_MSC_VER) |
168 | # define EINA_UNUSED | ||
168 | # define EINA_WARN_UNUSED_RESULT | 169 | # define EINA_WARN_UNUSED_RESULT |
169 | # define EINA_ARG_NONNULL(...) | 170 | # define EINA_ARG_NONNULL(...) |
170 | # if defined(_MSC_VER) && _MSC_VER >= 1300 | 171 | # if _MSC_VER >= 1300 |
171 | # define EINA_DEPRECATED __declspec(deprecated) | 172 | # define EINA_DEPRECATED __declspec(deprecated) |
172 | # else | 173 | # else |
173 | # define EINA_DEPRECATED | 174 | # define EINA_DEPRECATED |
@@ -184,6 +185,7 @@ | |||
184 | # define EINA_SENTINEL | 185 | # define EINA_SENTINEL |
185 | 186 | ||
186 | #elif defined(__SUNPRO_C) | 187 | #elif defined(__SUNPRO_C) |
188 | # define EINA_UNUSED | ||
187 | # define EINA_WARN_UNUSED_RESULT | 189 | # define EINA_WARN_UNUSED_RESULT |
188 | # define EINA_ARG_NONNULL(...) | 190 | # define EINA_ARG_NONNULL(...) |
189 | # define EINA_DEPRECATED | 191 | # define EINA_DEPRECATED |
@@ -207,7 +209,13 @@ | |||
207 | # define EINA_LIKELY(exp) exp | 209 | # define EINA_LIKELY(exp) exp |
208 | # define EINA_SENTINEL | 210 | # define EINA_SENTINEL |
209 | 211 | ||
210 | #else /* ! __GNUC__ && ! _WIN32 && ! __SUNPRO_C */ | 212 | #else /* ! __GNUC__ && ! _MSC_VER && ! __SUNPRO_C */ |
213 | |||
214 | /** | ||
215 | * @def EINA_UNUSED | ||
216 | * Used to warn when an argument of the function is not used. | ||
217 | */ | ||
218 | # define EINA_UNUSED | ||
211 | 219 | ||
212 | /** | 220 | /** |
213 | * @def EINA_WARN_UNUSED_RESULT | 221 | * @def EINA_WARN_UNUSED_RESULT |
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c index 9b132b7fe8..d6446cca57 100644 --- a/src/lib/eina/eina_value.c +++ b/src/lib/eina/eina_value.c | |||
@@ -112,7 +112,7 @@ static const long eina_value_long_min = -2147483647 - 1; | |||
112 | 112 | ||
113 | 113 | ||
114 | static Eina_Bool | 114 | static Eina_Bool |
115 | _eina_value_type_uchar_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 115 | _eina_value_type_uchar_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
116 | { | 116 | { |
117 | unsigned char *tmem = mem; | 117 | unsigned char *tmem = mem; |
118 | *tmem = 0; | 118 | *tmem = 0; |
@@ -120,13 +120,13 @@ _eina_value_type_uchar_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | static Eina_Bool | 122 | static Eina_Bool |
123 | _eina_value_type_uchar_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 123 | _eina_value_type_uchar_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
124 | { | 124 | { |
125 | return EINA_TRUE; | 125 | return EINA_TRUE; |
126 | } | 126 | } |
127 | 127 | ||
128 | static Eina_Bool | 128 | static Eina_Bool |
129 | _eina_value_type_uchar_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 129 | _eina_value_type_uchar_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
130 | { | 130 | { |
131 | const unsigned char *s = src; | 131 | const unsigned char *s = src; |
132 | unsigned char *d = dst; | 132 | unsigned char *d = dst; |
@@ -135,7 +135,7 @@ _eina_value_type_uchar_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
135 | } | 135 | } |
136 | 136 | ||
137 | static int | 137 | static int |
138 | _eina_value_type_uchar_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 138 | _eina_value_type_uchar_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
139 | { | 139 | { |
140 | const unsigned char *ta = a, *tb = b; | 140 | const unsigned char *ta = a, *tb = b; |
141 | if (*ta < *tb) | 141 | if (*ta < *tb) |
@@ -146,7 +146,7 @@ _eina_value_type_uchar_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
146 | } | 146 | } |
147 | 147 | ||
148 | static Eina_Bool | 148 | static Eina_Bool |
149 | _eina_value_type_uchar_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 149 | _eina_value_type_uchar_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
150 | { | 150 | { |
151 | const unsigned char v = *(const unsigned char *)type_mem; | 151 | const unsigned char v = *(const unsigned char *)type_mem; |
152 | 152 | ||
@@ -233,7 +233,7 @@ _eina_value_type_uchar_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
233 | } | 233 | } |
234 | 234 | ||
235 | static Eina_Bool | 235 | static Eina_Bool |
236 | _eina_value_type_uchar_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 236 | _eina_value_type_uchar_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
237 | { | 237 | { |
238 | unsigned char *tmem = mem; | 238 | unsigned char *tmem = mem; |
239 | *tmem = va_arg(args, unsigned int); /* char is promoted to int for va_arg */ | 239 | *tmem = va_arg(args, unsigned int); /* char is promoted to int for va_arg */ |
@@ -241,7 +241,7 @@ _eina_value_type_uchar_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v | |||
241 | } | 241 | } |
242 | 242 | ||
243 | static Eina_Bool | 243 | static Eina_Bool |
244 | _eina_value_type_uchar_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 244 | _eina_value_type_uchar_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
245 | { | 245 | { |
246 | unsigned char *tmem = mem; | 246 | unsigned char *tmem = mem; |
247 | const unsigned char *p = ptr; | 247 | const unsigned char *p = ptr; |
@@ -250,7 +250,7 @@ _eina_value_type_uchar_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c | |||
250 | } | 250 | } |
251 | 251 | ||
252 | static Eina_Bool | 252 | static Eina_Bool |
253 | _eina_value_type_uchar_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 253 | _eina_value_type_uchar_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
254 | { | 254 | { |
255 | const unsigned char *tmem = mem; | 255 | const unsigned char *tmem = mem; |
256 | unsigned char *p = ptr; | 256 | unsigned char *p = ptr; |
@@ -259,7 +259,7 @@ _eina_value_type_uchar_pget(const Eina_Value_Type *type __UNUSED__, const void * | |||
259 | } | 259 | } |
260 | 260 | ||
261 | static Eina_Bool | 261 | static Eina_Bool |
262 | _eina_value_type_ushort_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 262 | _eina_value_type_ushort_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
263 | { | 263 | { |
264 | unsigned short *tmem = mem; | 264 | unsigned short *tmem = mem; |
265 | *tmem = 0; | 265 | *tmem = 0; |
@@ -267,13 +267,13 @@ _eina_value_type_ushort_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
267 | } | 267 | } |
268 | 268 | ||
269 | static Eina_Bool | 269 | static Eina_Bool |
270 | _eina_value_type_ushort_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 270 | _eina_value_type_ushort_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
271 | { | 271 | { |
272 | return EINA_TRUE; | 272 | return EINA_TRUE; |
273 | } | 273 | } |
274 | 274 | ||
275 | static Eina_Bool | 275 | static Eina_Bool |
276 | _eina_value_type_ushort_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 276 | _eina_value_type_ushort_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
277 | { | 277 | { |
278 | const unsigned short *s = src; | 278 | const unsigned short *s = src; |
279 | unsigned short *d = dst; | 279 | unsigned short *d = dst; |
@@ -282,7 +282,7 @@ _eina_value_type_ushort_copy(const Eina_Value_Type *type __UNUSED__, const void | |||
282 | } | 282 | } |
283 | 283 | ||
284 | static int | 284 | static int |
285 | _eina_value_type_ushort_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 285 | _eina_value_type_ushort_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
286 | { | 286 | { |
287 | const unsigned short *ta = a, *tb = b; | 287 | const unsigned short *ta = a, *tb = b; |
288 | if (*ta < *tb) | 288 | if (*ta < *tb) |
@@ -293,7 +293,7 @@ _eina_value_type_ushort_compare(const Eina_Value_Type *type __UNUSED__, const vo | |||
293 | } | 293 | } |
294 | 294 | ||
295 | static Eina_Bool | 295 | static Eina_Bool |
296 | _eina_value_type_ushort_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 296 | _eina_value_type_ushort_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
297 | { | 297 | { |
298 | const unsigned short v = *(const unsigned short *)type_mem; | 298 | const unsigned short v = *(const unsigned short *)type_mem; |
299 | 299 | ||
@@ -384,7 +384,7 @@ _eina_value_type_ushort_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
384 | } | 384 | } |
385 | 385 | ||
386 | static Eina_Bool | 386 | static Eina_Bool |
387 | _eina_value_type_ushort_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 387 | _eina_value_type_ushort_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
388 | { | 388 | { |
389 | unsigned short *tmem = mem; | 389 | unsigned short *tmem = mem; |
390 | *tmem = va_arg(args, unsigned int); /* short is promoted to int for va_arg */ | 390 | *tmem = va_arg(args, unsigned int); /* short is promoted to int for va_arg */ |
@@ -392,7 +392,7 @@ _eina_value_type_ushort_vset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
392 | } | 392 | } |
393 | 393 | ||
394 | static Eina_Bool | 394 | static Eina_Bool |
395 | _eina_value_type_ushort_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 395 | _eina_value_type_ushort_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
396 | { | 396 | { |
397 | unsigned short *tmem = mem; | 397 | unsigned short *tmem = mem; |
398 | const unsigned short *p = ptr; | 398 | const unsigned short *p = ptr; |
@@ -401,7 +401,7 @@ _eina_value_type_ushort_pset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
401 | } | 401 | } |
402 | 402 | ||
403 | static Eina_Bool | 403 | static Eina_Bool |
404 | _eina_value_type_ushort_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 404 | _eina_value_type_ushort_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
405 | { | 405 | { |
406 | const unsigned short *tmem = mem; | 406 | const unsigned short *tmem = mem; |
407 | unsigned short *p = ptr; | 407 | unsigned short *p = ptr; |
@@ -410,7 +410,7 @@ _eina_value_type_ushort_pget(const Eina_Value_Type *type __UNUSED__, const void | |||
410 | } | 410 | } |
411 | 411 | ||
412 | static Eina_Bool | 412 | static Eina_Bool |
413 | _eina_value_type_uint_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 413 | _eina_value_type_uint_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
414 | { | 414 | { |
415 | unsigned int *tmem = mem; | 415 | unsigned int *tmem = mem; |
416 | *tmem = 0; | 416 | *tmem = 0; |
@@ -418,13 +418,13 @@ _eina_value_type_uint_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
418 | } | 418 | } |
419 | 419 | ||
420 | static Eina_Bool | 420 | static Eina_Bool |
421 | _eina_value_type_uint_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 421 | _eina_value_type_uint_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
422 | { | 422 | { |
423 | return EINA_TRUE; | 423 | return EINA_TRUE; |
424 | } | 424 | } |
425 | 425 | ||
426 | static Eina_Bool | 426 | static Eina_Bool |
427 | _eina_value_type_uint_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 427 | _eina_value_type_uint_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
428 | { | 428 | { |
429 | const unsigned int *s = src; | 429 | const unsigned int *s = src; |
430 | unsigned int *d = dst; | 430 | unsigned int *d = dst; |
@@ -433,7 +433,7 @@ _eina_value_type_uint_copy(const Eina_Value_Type *type __UNUSED__, const void *s | |||
433 | } | 433 | } |
434 | 434 | ||
435 | static int | 435 | static int |
436 | _eina_value_type_uint_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 436 | _eina_value_type_uint_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
437 | { | 437 | { |
438 | const unsigned int *ta = a, *tb = b; | 438 | const unsigned int *ta = a, *tb = b; |
439 | if (*ta < *tb) | 439 | if (*ta < *tb) |
@@ -444,7 +444,7 @@ _eina_value_type_uint_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
444 | } | 444 | } |
445 | 445 | ||
446 | static Eina_Bool | 446 | static Eina_Bool |
447 | _eina_value_type_uint_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 447 | _eina_value_type_uint_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
448 | { | 448 | { |
449 | const unsigned int v = *(const unsigned int *)type_mem; | 449 | const unsigned int v = *(const unsigned int *)type_mem; |
450 | 450 | ||
@@ -539,7 +539,7 @@ _eina_value_type_uint_convert_to(const Eina_Value_Type *type __UNUSED__, const E | |||
539 | } | 539 | } |
540 | 540 | ||
541 | static Eina_Bool | 541 | static Eina_Bool |
542 | _eina_value_type_uint_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 542 | _eina_value_type_uint_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
543 | { | 543 | { |
544 | unsigned int *tmem = mem; | 544 | unsigned int *tmem = mem; |
545 | *tmem = va_arg(args, unsigned int); | 545 | *tmem = va_arg(args, unsigned int); |
@@ -547,7 +547,7 @@ _eina_value_type_uint_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va | |||
547 | } | 547 | } |
548 | 548 | ||
549 | static Eina_Bool | 549 | static Eina_Bool |
550 | _eina_value_type_uint_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 550 | _eina_value_type_uint_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
551 | { | 551 | { |
552 | unsigned int *tmem = mem; | 552 | unsigned int *tmem = mem; |
553 | const unsigned int *p = ptr; | 553 | const unsigned int *p = ptr; |
@@ -556,7 +556,7 @@ _eina_value_type_uint_pset(const Eina_Value_Type *type __UNUSED__, void *mem, co | |||
556 | } | 556 | } |
557 | 557 | ||
558 | static Eina_Bool | 558 | static Eina_Bool |
559 | _eina_value_type_uint_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 559 | _eina_value_type_uint_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
560 | { | 560 | { |
561 | const unsigned int *tmem = mem; | 561 | const unsigned int *tmem = mem; |
562 | unsigned int *p = ptr; | 562 | unsigned int *p = ptr; |
@@ -565,7 +565,7 @@ _eina_value_type_uint_pget(const Eina_Value_Type *type __UNUSED__, const void *m | |||
565 | } | 565 | } |
566 | 566 | ||
567 | static Eina_Bool | 567 | static Eina_Bool |
568 | _eina_value_type_ulong_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 568 | _eina_value_type_ulong_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
569 | { | 569 | { |
570 | unsigned long *tmem = mem; | 570 | unsigned long *tmem = mem; |
571 | *tmem = 0; | 571 | *tmem = 0; |
@@ -573,13 +573,13 @@ _eina_value_type_ulong_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
573 | } | 573 | } |
574 | 574 | ||
575 | static Eina_Bool | 575 | static Eina_Bool |
576 | _eina_value_type_ulong_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 576 | _eina_value_type_ulong_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
577 | { | 577 | { |
578 | return EINA_TRUE; | 578 | return EINA_TRUE; |
579 | } | 579 | } |
580 | 580 | ||
581 | static Eina_Bool | 581 | static Eina_Bool |
582 | _eina_value_type_ulong_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 582 | _eina_value_type_ulong_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
583 | { | 583 | { |
584 | const unsigned long *s = src; | 584 | const unsigned long *s = src; |
585 | unsigned long *d = dst; | 585 | unsigned long *d = dst; |
@@ -588,7 +588,7 @@ _eina_value_type_ulong_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
588 | } | 588 | } |
589 | 589 | ||
590 | static int | 590 | static int |
591 | _eina_value_type_ulong_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 591 | _eina_value_type_ulong_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
592 | { | 592 | { |
593 | const unsigned long *ta = a, *tb = b; | 593 | const unsigned long *ta = a, *tb = b; |
594 | if (*ta < *tb) | 594 | if (*ta < *tb) |
@@ -599,7 +599,7 @@ _eina_value_type_ulong_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
599 | } | 599 | } |
600 | 600 | ||
601 | static Eina_Bool | 601 | static Eina_Bool |
602 | _eina_value_type_ulong_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 602 | _eina_value_type_ulong_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
603 | { | 603 | { |
604 | const unsigned long v = *(const unsigned long *)type_mem; | 604 | const unsigned long v = *(const unsigned long *)type_mem; |
605 | 605 | ||
@@ -698,7 +698,7 @@ _eina_value_type_ulong_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
698 | } | 698 | } |
699 | 699 | ||
700 | static Eina_Bool | 700 | static Eina_Bool |
701 | _eina_value_type_ulong_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 701 | _eina_value_type_ulong_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
702 | { | 702 | { |
703 | unsigned long *tmem = mem; | 703 | unsigned long *tmem = mem; |
704 | *tmem = va_arg(args, unsigned long); | 704 | *tmem = va_arg(args, unsigned long); |
@@ -706,7 +706,7 @@ _eina_value_type_ulong_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v | |||
706 | } | 706 | } |
707 | 707 | ||
708 | static Eina_Bool | 708 | static Eina_Bool |
709 | _eina_value_type_ulong_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 709 | _eina_value_type_ulong_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
710 | { | 710 | { |
711 | unsigned long *tmem = mem; | 711 | unsigned long *tmem = mem; |
712 | const unsigned long *p = ptr; | 712 | const unsigned long *p = ptr; |
@@ -715,7 +715,7 @@ _eina_value_type_ulong_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c | |||
715 | } | 715 | } |
716 | 716 | ||
717 | static Eina_Bool | 717 | static Eina_Bool |
718 | _eina_value_type_ulong_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 718 | _eina_value_type_ulong_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
719 | { | 719 | { |
720 | const unsigned long *tmem = mem; | 720 | const unsigned long *tmem = mem; |
721 | unsigned long *p = ptr; | 721 | unsigned long *p = ptr; |
@@ -724,7 +724,7 @@ _eina_value_type_ulong_pget(const Eina_Value_Type *type __UNUSED__, const void * | |||
724 | } | 724 | } |
725 | 725 | ||
726 | static Eina_Bool | 726 | static Eina_Bool |
727 | _eina_value_type_uint64_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 727 | _eina_value_type_uint64_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
728 | { | 728 | { |
729 | uint64_t *tmem = mem; | 729 | uint64_t *tmem = mem; |
730 | *tmem = 0; | 730 | *tmem = 0; |
@@ -732,13 +732,13 @@ _eina_value_type_uint64_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
732 | } | 732 | } |
733 | 733 | ||
734 | static Eina_Bool | 734 | static Eina_Bool |
735 | _eina_value_type_uint64_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 735 | _eina_value_type_uint64_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
736 | { | 736 | { |
737 | return EINA_TRUE; | 737 | return EINA_TRUE; |
738 | } | 738 | } |
739 | 739 | ||
740 | static Eina_Bool | 740 | static Eina_Bool |
741 | _eina_value_type_uint64_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 741 | _eina_value_type_uint64_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
742 | { | 742 | { |
743 | const uint64_t *s = src; | 743 | const uint64_t *s = src; |
744 | uint64_t *d = dst; | 744 | uint64_t *d = dst; |
@@ -747,7 +747,7 @@ _eina_value_type_uint64_copy(const Eina_Value_Type *type __UNUSED__, const void | |||
747 | } | 747 | } |
748 | 748 | ||
749 | static int | 749 | static int |
750 | _eina_value_type_uint64_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 750 | _eina_value_type_uint64_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
751 | { | 751 | { |
752 | const uint64_t *ta = a, *tb = b; | 752 | const uint64_t *ta = a, *tb = b; |
753 | if (*ta < *tb) | 753 | if (*ta < *tb) |
@@ -758,7 +758,7 @@ _eina_value_type_uint64_compare(const Eina_Value_Type *type __UNUSED__, const vo | |||
758 | } | 758 | } |
759 | 759 | ||
760 | static Eina_Bool | 760 | static Eina_Bool |
761 | _eina_value_type_uint64_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 761 | _eina_value_type_uint64_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
762 | { | 762 | { |
763 | const uint64_t v = *(const uint64_t *)type_mem; | 763 | const uint64_t v = *(const uint64_t *)type_mem; |
764 | 764 | ||
@@ -862,7 +862,7 @@ _eina_value_type_uint64_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
862 | } | 862 | } |
863 | 863 | ||
864 | static Eina_Bool | 864 | static Eina_Bool |
865 | _eina_value_type_uint64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 865 | _eina_value_type_uint64_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
866 | { | 866 | { |
867 | uint64_t *tmem = mem; | 867 | uint64_t *tmem = mem; |
868 | *tmem = va_arg(args, uint64_t); | 868 | *tmem = va_arg(args, uint64_t); |
@@ -870,7 +870,7 @@ _eina_value_type_uint64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
870 | } | 870 | } |
871 | 871 | ||
872 | static Eina_Bool | 872 | static Eina_Bool |
873 | _eina_value_type_uint64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 873 | _eina_value_type_uint64_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
874 | { | 874 | { |
875 | uint64_t *tmem = mem; | 875 | uint64_t *tmem = mem; |
876 | const uint64_t *p = ptr; | 876 | const uint64_t *p = ptr; |
@@ -879,7 +879,7 @@ _eina_value_type_uint64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
879 | } | 879 | } |
880 | 880 | ||
881 | static Eina_Bool | 881 | static Eina_Bool |
882 | _eina_value_type_uint64_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 882 | _eina_value_type_uint64_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
883 | { | 883 | { |
884 | const uint64_t *tmem = mem; | 884 | const uint64_t *tmem = mem; |
885 | uint64_t *p = ptr; | 885 | uint64_t *p = ptr; |
@@ -888,7 +888,7 @@ _eina_value_type_uint64_pget(const Eina_Value_Type *type __UNUSED__, const void | |||
888 | } | 888 | } |
889 | 889 | ||
890 | static Eina_Bool | 890 | static Eina_Bool |
891 | _eina_value_type_char_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 891 | _eina_value_type_char_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
892 | { | 892 | { |
893 | char *tmem = mem; | 893 | char *tmem = mem; |
894 | *tmem = 0; | 894 | *tmem = 0; |
@@ -896,13 +896,13 @@ _eina_value_type_char_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
896 | } | 896 | } |
897 | 897 | ||
898 | static Eina_Bool | 898 | static Eina_Bool |
899 | _eina_value_type_char_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 899 | _eina_value_type_char_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
900 | { | 900 | { |
901 | return EINA_TRUE; | 901 | return EINA_TRUE; |
902 | } | 902 | } |
903 | 903 | ||
904 | static Eina_Bool | 904 | static Eina_Bool |
905 | _eina_value_type_char_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 905 | _eina_value_type_char_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
906 | { | 906 | { |
907 | const char *s = src; | 907 | const char *s = src; |
908 | char *d = dst; | 908 | char *d = dst; |
@@ -911,7 +911,7 @@ _eina_value_type_char_copy(const Eina_Value_Type *type __UNUSED__, const void *s | |||
911 | } | 911 | } |
912 | 912 | ||
913 | static int | 913 | static int |
914 | _eina_value_type_char_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 914 | _eina_value_type_char_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
915 | { | 915 | { |
916 | const char *ta = a, *tb = b; | 916 | const char *ta = a, *tb = b; |
917 | if (*ta < *tb) | 917 | if (*ta < *tb) |
@@ -922,7 +922,7 @@ _eina_value_type_char_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
922 | } | 922 | } |
923 | 923 | ||
924 | static Eina_Bool | 924 | static Eina_Bool |
925 | _eina_value_type_char_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 925 | _eina_value_type_char_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
926 | { | 926 | { |
927 | const signed char v = *(const signed char *)type_mem; | 927 | const signed char v = *(const signed char *)type_mem; |
928 | 928 | ||
@@ -1017,7 +1017,7 @@ _eina_value_type_char_convert_to(const Eina_Value_Type *type __UNUSED__, const E | |||
1017 | } | 1017 | } |
1018 | 1018 | ||
1019 | static Eina_Bool | 1019 | static Eina_Bool |
1020 | _eina_value_type_char_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 1020 | _eina_value_type_char_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
1021 | { | 1021 | { |
1022 | char *tmem = mem; | 1022 | char *tmem = mem; |
1023 | *tmem = va_arg(args, int); /* char is promoted to int for va_arg */ | 1023 | *tmem = va_arg(args, int); /* char is promoted to int for va_arg */ |
@@ -1025,7 +1025,7 @@ _eina_value_type_char_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va | |||
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | static Eina_Bool | 1027 | static Eina_Bool |
1028 | _eina_value_type_char_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 1028 | _eina_value_type_char_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
1029 | { | 1029 | { |
1030 | char *tmem = mem; | 1030 | char *tmem = mem; |
1031 | const char *p = ptr; | 1031 | const char *p = ptr; |
@@ -1034,7 +1034,7 @@ _eina_value_type_char_pset(const Eina_Value_Type *type __UNUSED__, void *mem, co | |||
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | static Eina_Bool | 1036 | static Eina_Bool |
1037 | _eina_value_type_char_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 1037 | _eina_value_type_char_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
1038 | { | 1038 | { |
1039 | const char *tmem = mem; | 1039 | const char *tmem = mem; |
1040 | char *p = ptr; | 1040 | char *p = ptr; |
@@ -1043,7 +1043,7 @@ _eina_value_type_char_pget(const Eina_Value_Type *type __UNUSED__, const void *m | |||
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | static Eina_Bool | 1045 | static Eina_Bool |
1046 | _eina_value_type_short_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 1046 | _eina_value_type_short_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
1047 | { | 1047 | { |
1048 | short *tmem = mem; | 1048 | short *tmem = mem; |
1049 | *tmem = 0; | 1049 | *tmem = 0; |
@@ -1051,13 +1051,13 @@ _eina_value_type_short_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | static Eina_Bool | 1053 | static Eina_Bool |
1054 | _eina_value_type_short_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 1054 | _eina_value_type_short_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
1055 | { | 1055 | { |
1056 | return EINA_TRUE; | 1056 | return EINA_TRUE; |
1057 | } | 1057 | } |
1058 | 1058 | ||
1059 | static Eina_Bool | 1059 | static Eina_Bool |
1060 | _eina_value_type_short_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 1060 | _eina_value_type_short_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
1061 | { | 1061 | { |
1062 | const short *s = src; | 1062 | const short *s = src; |
1063 | short *d = dst; | 1063 | short *d = dst; |
@@ -1066,7 +1066,7 @@ _eina_value_type_short_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | static int | 1068 | static int |
1069 | _eina_value_type_short_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 1069 | _eina_value_type_short_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
1070 | { | 1070 | { |
1071 | const short *ta = a, *tb = b; | 1071 | const short *ta = a, *tb = b; |
1072 | if (*ta < *tb) | 1072 | if (*ta < *tb) |
@@ -1077,7 +1077,7 @@ _eina_value_type_short_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
1077 | } | 1077 | } |
1078 | 1078 | ||
1079 | static Eina_Bool | 1079 | static Eina_Bool |
1080 | _eina_value_type_short_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 1080 | _eina_value_type_short_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
1081 | { | 1081 | { |
1082 | const short v = *(const short *)type_mem; | 1082 | const short v = *(const short *)type_mem; |
1083 | 1083 | ||
@@ -1178,7 +1178,7 @@ _eina_value_type_short_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | static Eina_Bool | 1180 | static Eina_Bool |
1181 | _eina_value_type_short_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 1181 | _eina_value_type_short_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
1182 | { | 1182 | { |
1183 | short *tmem = mem; | 1183 | short *tmem = mem; |
1184 | *tmem = va_arg(args, int); /* short int is promoted to int for va_arg */ | 1184 | *tmem = va_arg(args, int); /* short int is promoted to int for va_arg */ |
@@ -1186,7 +1186,7 @@ _eina_value_type_short_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v | |||
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | static Eina_Bool | 1188 | static Eina_Bool |
1189 | _eina_value_type_short_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 1189 | _eina_value_type_short_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
1190 | { | 1190 | { |
1191 | short *tmem = mem; | 1191 | short *tmem = mem; |
1192 | const short *p = ptr; | 1192 | const short *p = ptr; |
@@ -1195,7 +1195,7 @@ _eina_value_type_short_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c | |||
1195 | } | 1195 | } |
1196 | 1196 | ||
1197 | static Eina_Bool | 1197 | static Eina_Bool |
1198 | _eina_value_type_short_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 1198 | _eina_value_type_short_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
1199 | { | 1199 | { |
1200 | const short *tmem = mem; | 1200 | const short *tmem = mem; |
1201 | short *p = ptr; | 1201 | short *p = ptr; |
@@ -1204,7 +1204,7 @@ _eina_value_type_short_pget(const Eina_Value_Type *type __UNUSED__, const void * | |||
1204 | } | 1204 | } |
1205 | 1205 | ||
1206 | static Eina_Bool | 1206 | static Eina_Bool |
1207 | _eina_value_type_int_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 1207 | _eina_value_type_int_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
1208 | { | 1208 | { |
1209 | int *tmem = mem; | 1209 | int *tmem = mem; |
1210 | *tmem = 0; | 1210 | *tmem = 0; |
@@ -1212,13 +1212,13 @@ _eina_value_type_int_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
1212 | } | 1212 | } |
1213 | 1213 | ||
1214 | static Eina_Bool | 1214 | static Eina_Bool |
1215 | _eina_value_type_int_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 1215 | _eina_value_type_int_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
1216 | { | 1216 | { |
1217 | return EINA_TRUE; | 1217 | return EINA_TRUE; |
1218 | } | 1218 | } |
1219 | 1219 | ||
1220 | static Eina_Bool | 1220 | static Eina_Bool |
1221 | _eina_value_type_int_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 1221 | _eina_value_type_int_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
1222 | { | 1222 | { |
1223 | const int *s = src; | 1223 | const int *s = src; |
1224 | int *d = dst; | 1224 | int *d = dst; |
@@ -1227,7 +1227,7 @@ _eina_value_type_int_copy(const Eina_Value_Type *type __UNUSED__, const void *sr | |||
1227 | } | 1227 | } |
1228 | 1228 | ||
1229 | static int | 1229 | static int |
1230 | _eina_value_type_int_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 1230 | _eina_value_type_int_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
1231 | { | 1231 | { |
1232 | const int *ta = a, *tb = b; | 1232 | const int *ta = a, *tb = b; |
1233 | if (*ta < *tb) | 1233 | if (*ta < *tb) |
@@ -1238,7 +1238,7 @@ _eina_value_type_int_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | static Eina_Bool | 1240 | static Eina_Bool |
1241 | _eina_value_type_int_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 1241 | _eina_value_type_int_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
1242 | { | 1242 | { |
1243 | const int v = *(const int *)type_mem; | 1243 | const int v = *(const int *)type_mem; |
1244 | 1244 | ||
@@ -1345,7 +1345,7 @@ _eina_value_type_int_convert_to(const Eina_Value_Type *type __UNUSED__, const Ei | |||
1345 | } | 1345 | } |
1346 | 1346 | ||
1347 | static Eina_Bool | 1347 | static Eina_Bool |
1348 | _eina_value_type_int_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 1348 | _eina_value_type_int_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
1349 | { | 1349 | { |
1350 | int *tmem = mem; | 1350 | int *tmem = mem; |
1351 | *tmem = va_arg(args, int); | 1351 | *tmem = va_arg(args, int); |
@@ -1353,7 +1353,7 @@ _eina_value_type_int_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_ | |||
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | static Eina_Bool | 1355 | static Eina_Bool |
1356 | _eina_value_type_int_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 1356 | _eina_value_type_int_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
1357 | { | 1357 | { |
1358 | int *tmem = mem; | 1358 | int *tmem = mem; |
1359 | const int *p = ptr; | 1359 | const int *p = ptr; |
@@ -1362,7 +1362,7 @@ _eina_value_type_int_pset(const Eina_Value_Type *type __UNUSED__, void *mem, con | |||
1362 | } | 1362 | } |
1363 | 1363 | ||
1364 | static Eina_Bool | 1364 | static Eina_Bool |
1365 | _eina_value_type_int_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 1365 | _eina_value_type_int_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
1366 | { | 1366 | { |
1367 | const int *tmem = mem; | 1367 | const int *tmem = mem; |
1368 | int *p = ptr; | 1368 | int *p = ptr; |
@@ -1371,7 +1371,7 @@ _eina_value_type_int_pget(const Eina_Value_Type *type __UNUSED__, const void *me | |||
1371 | } | 1371 | } |
1372 | 1372 | ||
1373 | static Eina_Bool | 1373 | static Eina_Bool |
1374 | _eina_value_type_long_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 1374 | _eina_value_type_long_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
1375 | { | 1375 | { |
1376 | long *tmem = mem; | 1376 | long *tmem = mem; |
1377 | *tmem = 0; | 1377 | *tmem = 0; |
@@ -1379,13 +1379,13 @@ _eina_value_type_long_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
1379 | } | 1379 | } |
1380 | 1380 | ||
1381 | static Eina_Bool | 1381 | static Eina_Bool |
1382 | _eina_value_type_long_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 1382 | _eina_value_type_long_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
1383 | { | 1383 | { |
1384 | return EINA_TRUE; | 1384 | return EINA_TRUE; |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | static Eina_Bool | 1387 | static Eina_Bool |
1388 | _eina_value_type_long_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 1388 | _eina_value_type_long_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
1389 | { | 1389 | { |
1390 | const long *s = src; | 1390 | const long *s = src; |
1391 | long *d = dst; | 1391 | long *d = dst; |
@@ -1394,7 +1394,7 @@ _eina_value_type_long_copy(const Eina_Value_Type *type __UNUSED__, const void *s | |||
1394 | } | 1394 | } |
1395 | 1395 | ||
1396 | static int | 1396 | static int |
1397 | _eina_value_type_long_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 1397 | _eina_value_type_long_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
1398 | { | 1398 | { |
1399 | const long *ta = a, *tb = b; | 1399 | const long *ta = a, *tb = b; |
1400 | if (*ta < *tb) | 1400 | if (*ta < *tb) |
@@ -1405,7 +1405,7 @@ _eina_value_type_long_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
1405 | } | 1405 | } |
1406 | 1406 | ||
1407 | static Eina_Bool | 1407 | static Eina_Bool |
1408 | _eina_value_type_long_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 1408 | _eina_value_type_long_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
1409 | { | 1409 | { |
1410 | const long v = *(const long *)type_mem; | 1410 | const long v = *(const long *)type_mem; |
1411 | 1411 | ||
@@ -1518,7 +1518,7 @@ _eina_value_type_long_convert_to(const Eina_Value_Type *type __UNUSED__, const E | |||
1518 | } | 1518 | } |
1519 | 1519 | ||
1520 | static Eina_Bool | 1520 | static Eina_Bool |
1521 | _eina_value_type_long_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 1521 | _eina_value_type_long_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
1522 | { | 1522 | { |
1523 | long *tmem = mem; | 1523 | long *tmem = mem; |
1524 | *tmem = va_arg(args, long); | 1524 | *tmem = va_arg(args, long); |
@@ -1526,7 +1526,7 @@ _eina_value_type_long_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va | |||
1526 | } | 1526 | } |
1527 | 1527 | ||
1528 | static Eina_Bool | 1528 | static Eina_Bool |
1529 | _eina_value_type_long_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 1529 | _eina_value_type_long_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
1530 | { | 1530 | { |
1531 | long *tmem = mem; | 1531 | long *tmem = mem; |
1532 | const long *p = ptr; | 1532 | const long *p = ptr; |
@@ -1535,7 +1535,7 @@ _eina_value_type_long_pset(const Eina_Value_Type *type __UNUSED__, void *mem, co | |||
1535 | } | 1535 | } |
1536 | 1536 | ||
1537 | static Eina_Bool | 1537 | static Eina_Bool |
1538 | _eina_value_type_long_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 1538 | _eina_value_type_long_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
1539 | { | 1539 | { |
1540 | const long *tmem = mem; | 1540 | const long *tmem = mem; |
1541 | long *p = ptr; | 1541 | long *p = ptr; |
@@ -1544,7 +1544,7 @@ _eina_value_type_long_pget(const Eina_Value_Type *type __UNUSED__, const void *m | |||
1544 | } | 1544 | } |
1545 | 1545 | ||
1546 | static Eina_Bool | 1546 | static Eina_Bool |
1547 | _eina_value_type_int64_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 1547 | _eina_value_type_int64_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
1548 | { | 1548 | { |
1549 | int64_t *tmem = mem; | 1549 | int64_t *tmem = mem; |
1550 | *tmem = 0; | 1550 | *tmem = 0; |
@@ -1552,13 +1552,13 @@ _eina_value_type_int64_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
1552 | } | 1552 | } |
1553 | 1553 | ||
1554 | static Eina_Bool | 1554 | static Eina_Bool |
1555 | _eina_value_type_int64_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 1555 | _eina_value_type_int64_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
1556 | { | 1556 | { |
1557 | return EINA_TRUE; | 1557 | return EINA_TRUE; |
1558 | } | 1558 | } |
1559 | 1559 | ||
1560 | static Eina_Bool | 1560 | static Eina_Bool |
1561 | _eina_value_type_int64_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 1561 | _eina_value_type_int64_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
1562 | { | 1562 | { |
1563 | const int64_t *s = src; | 1563 | const int64_t *s = src; |
1564 | int64_t *d = dst; | 1564 | int64_t *d = dst; |
@@ -1567,7 +1567,7 @@ _eina_value_type_int64_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
1567 | } | 1567 | } |
1568 | 1568 | ||
1569 | static int | 1569 | static int |
1570 | _eina_value_type_int64_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 1570 | _eina_value_type_int64_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
1571 | { | 1571 | { |
1572 | const int64_t *ta = a, *tb = b; | 1572 | const int64_t *ta = a, *tb = b; |
1573 | if (*ta < *tb) | 1573 | if (*ta < *tb) |
@@ -1578,7 +1578,7 @@ _eina_value_type_int64_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
1578 | } | 1578 | } |
1579 | 1579 | ||
1580 | static Eina_Bool | 1580 | static Eina_Bool |
1581 | _eina_value_type_int64_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 1581 | _eina_value_type_int64_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
1582 | { | 1582 | { |
1583 | const int64_t v = *(const int64_t *)type_mem; | 1583 | const int64_t v = *(const int64_t *)type_mem; |
1584 | 1584 | ||
@@ -1698,7 +1698,7 @@ _eina_value_type_int64_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
1698 | } | 1698 | } |
1699 | 1699 | ||
1700 | static Eina_Bool | 1700 | static Eina_Bool |
1701 | _eina_value_type_int64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 1701 | _eina_value_type_int64_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
1702 | { | 1702 | { |
1703 | int64_t *tmem = mem; | 1703 | int64_t *tmem = mem; |
1704 | *tmem = va_arg(args, int64_t); | 1704 | *tmem = va_arg(args, int64_t); |
@@ -1706,7 +1706,7 @@ _eina_value_type_int64_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v | |||
1706 | } | 1706 | } |
1707 | 1707 | ||
1708 | static Eina_Bool | 1708 | static Eina_Bool |
1709 | _eina_value_type_int64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 1709 | _eina_value_type_int64_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
1710 | { | 1710 | { |
1711 | int64_t *tmem = mem; | 1711 | int64_t *tmem = mem; |
1712 | const int64_t *p = ptr; | 1712 | const int64_t *p = ptr; |
@@ -1715,7 +1715,7 @@ _eina_value_type_int64_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c | |||
1715 | } | 1715 | } |
1716 | 1716 | ||
1717 | static Eina_Bool | 1717 | static Eina_Bool |
1718 | _eina_value_type_int64_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 1718 | _eina_value_type_int64_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
1719 | { | 1719 | { |
1720 | const int64_t *tmem = mem; | 1720 | const int64_t *tmem = mem; |
1721 | int64_t *p = ptr; | 1721 | int64_t *p = ptr; |
@@ -1724,7 +1724,7 @@ _eina_value_type_int64_pget(const Eina_Value_Type *type __UNUSED__, const void * | |||
1724 | } | 1724 | } |
1725 | 1725 | ||
1726 | static Eina_Bool | 1726 | static Eina_Bool |
1727 | _eina_value_type_float_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 1727 | _eina_value_type_float_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
1728 | { | 1728 | { |
1729 | float *tmem = mem; | 1729 | float *tmem = mem; |
1730 | *tmem = 0; | 1730 | *tmem = 0; |
@@ -1732,13 +1732,13 @@ _eina_value_type_float_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
1732 | } | 1732 | } |
1733 | 1733 | ||
1734 | static Eina_Bool | 1734 | static Eina_Bool |
1735 | _eina_value_type_float_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 1735 | _eina_value_type_float_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
1736 | { | 1736 | { |
1737 | return EINA_TRUE; | 1737 | return EINA_TRUE; |
1738 | } | 1738 | } |
1739 | 1739 | ||
1740 | static Eina_Bool | 1740 | static Eina_Bool |
1741 | _eina_value_type_float_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 1741 | _eina_value_type_float_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
1742 | { | 1742 | { |
1743 | const float *s = src; | 1743 | const float *s = src; |
1744 | float *d = dst; | 1744 | float *d = dst; |
@@ -1747,7 +1747,7 @@ _eina_value_type_float_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
1747 | } | 1747 | } |
1748 | 1748 | ||
1749 | static int | 1749 | static int |
1750 | _eina_value_type_float_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 1750 | _eina_value_type_float_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
1751 | { | 1751 | { |
1752 | const float *ta = a, *tb = b; | 1752 | const float *ta = a, *tb = b; |
1753 | if (*ta < *tb) | 1753 | if (*ta < *tb) |
@@ -1758,7 +1758,7 @@ _eina_value_type_float_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
1758 | } | 1758 | } |
1759 | 1759 | ||
1760 | static Eina_Bool | 1760 | static Eina_Bool |
1761 | _eina_value_type_float_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 1761 | _eina_value_type_float_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
1762 | { | 1762 | { |
1763 | const float v = *(const float *)type_mem; | 1763 | const float v = *(const float *)type_mem; |
1764 | 1764 | ||
@@ -1884,7 +1884,7 @@ _eina_value_type_float_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
1884 | } | 1884 | } |
1885 | 1885 | ||
1886 | static Eina_Bool | 1886 | static Eina_Bool |
1887 | _eina_value_type_float_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 1887 | _eina_value_type_float_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
1888 | { | 1888 | { |
1889 | float *tmem = mem; | 1889 | float *tmem = mem; |
1890 | *tmem = va_arg(args, double); /* float is promoted to double for va_args */ | 1890 | *tmem = va_arg(args, double); /* float is promoted to double for va_args */ |
@@ -1892,7 +1892,7 @@ _eina_value_type_float_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v | |||
1892 | } | 1892 | } |
1893 | 1893 | ||
1894 | static Eina_Bool | 1894 | static Eina_Bool |
1895 | _eina_value_type_float_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 1895 | _eina_value_type_float_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
1896 | { | 1896 | { |
1897 | float *tmem = mem; | 1897 | float *tmem = mem; |
1898 | const float *p = ptr; | 1898 | const float *p = ptr; |
@@ -1901,7 +1901,7 @@ _eina_value_type_float_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c | |||
1901 | } | 1901 | } |
1902 | 1902 | ||
1903 | static Eina_Bool | 1903 | static Eina_Bool |
1904 | _eina_value_type_float_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 1904 | _eina_value_type_float_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
1905 | { | 1905 | { |
1906 | const float *tmem = mem; | 1906 | const float *tmem = mem; |
1907 | float *p = ptr; | 1907 | float *p = ptr; |
@@ -1910,7 +1910,7 @@ _eina_value_type_float_pget(const Eina_Value_Type *type __UNUSED__, const void * | |||
1910 | } | 1910 | } |
1911 | 1911 | ||
1912 | static Eina_Bool | 1912 | static Eina_Bool |
1913 | _eina_value_type_double_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 1913 | _eina_value_type_double_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
1914 | { | 1914 | { |
1915 | double *tmem = mem; | 1915 | double *tmem = mem; |
1916 | *tmem = 0; | 1916 | *tmem = 0; |
@@ -1918,13 +1918,13 @@ _eina_value_type_double_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
1918 | } | 1918 | } |
1919 | 1919 | ||
1920 | static Eina_Bool | 1920 | static Eina_Bool |
1921 | _eina_value_type_double_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 1921 | _eina_value_type_double_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
1922 | { | 1922 | { |
1923 | return EINA_TRUE; | 1923 | return EINA_TRUE; |
1924 | } | 1924 | } |
1925 | 1925 | ||
1926 | static Eina_Bool | 1926 | static Eina_Bool |
1927 | _eina_value_type_double_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 1927 | _eina_value_type_double_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
1928 | { | 1928 | { |
1929 | const double *s = src; | 1929 | const double *s = src; |
1930 | double *d = dst; | 1930 | double *d = dst; |
@@ -1933,7 +1933,7 @@ _eina_value_type_double_copy(const Eina_Value_Type *type __UNUSED__, const void | |||
1933 | } | 1933 | } |
1934 | 1934 | ||
1935 | static int | 1935 | static int |
1936 | _eina_value_type_double_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 1936 | _eina_value_type_double_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
1937 | { | 1937 | { |
1938 | const double *ta = a, *tb = b; | 1938 | const double *ta = a, *tb = b; |
1939 | if (*ta < *tb) | 1939 | if (*ta < *tb) |
@@ -1944,7 +1944,7 @@ _eina_value_type_double_compare(const Eina_Value_Type *type __UNUSED__, const vo | |||
1944 | } | 1944 | } |
1945 | 1945 | ||
1946 | static Eina_Bool | 1946 | static Eina_Bool |
1947 | _eina_value_type_double_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 1947 | _eina_value_type_double_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
1948 | { | 1948 | { |
1949 | const double v = *(const double *)type_mem; | 1949 | const double v = *(const double *)type_mem; |
1950 | 1950 | ||
@@ -2064,7 +2064,7 @@ _eina_value_type_double_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
2064 | } | 2064 | } |
2065 | 2065 | ||
2066 | static Eina_Bool | 2066 | static Eina_Bool |
2067 | _eina_value_type_double_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 2067 | _eina_value_type_double_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
2068 | { | 2068 | { |
2069 | double *tmem = mem; | 2069 | double *tmem = mem; |
2070 | *tmem = va_arg(args, double); | 2070 | *tmem = va_arg(args, double); |
@@ -2072,7 +2072,7 @@ _eina_value_type_double_vset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
2072 | } | 2072 | } |
2073 | 2073 | ||
2074 | static Eina_Bool | 2074 | static Eina_Bool |
2075 | _eina_value_type_double_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 2075 | _eina_value_type_double_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
2076 | { | 2076 | { |
2077 | double *tmem = mem; | 2077 | double *tmem = mem; |
2078 | const double *p = ptr; | 2078 | const double *p = ptr; |
@@ -2081,7 +2081,7 @@ _eina_value_type_double_pset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
2081 | } | 2081 | } |
2082 | 2082 | ||
2083 | static Eina_Bool | 2083 | static Eina_Bool |
2084 | _eina_value_type_double_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 2084 | _eina_value_type_double_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
2085 | { | 2085 | { |
2086 | const double *tmem = mem; | 2086 | const double *tmem = mem; |
2087 | double *p = ptr; | 2087 | double *p = ptr; |
@@ -2090,7 +2090,7 @@ _eina_value_type_double_pget(const Eina_Value_Type *type __UNUSED__, const void | |||
2090 | } | 2090 | } |
2091 | 2091 | ||
2092 | static Eina_Bool | 2092 | static Eina_Bool |
2093 | _eina_value_type_string_common_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 2093 | _eina_value_type_string_common_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2094 | { | 2094 | { |
2095 | const char **tmem = mem; | 2095 | const char **tmem = mem; |
2096 | *tmem = NULL; | 2096 | *tmem = NULL; |
@@ -2098,7 +2098,7 @@ _eina_value_type_string_common_setup(const Eina_Value_Type *type __UNUSED__, voi | |||
2098 | } | 2098 | } |
2099 | 2099 | ||
2100 | static int | 2100 | static int |
2101 | _eina_value_type_string_common_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 2101 | _eina_value_type_string_common_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
2102 | { | 2102 | { |
2103 | const char *sa = *(const char **)a; | 2103 | const char *sa = *(const char **)a; |
2104 | const char *sb = *(const char **)b; | 2104 | const char *sb = *(const char **)b; |
@@ -2112,7 +2112,7 @@ _eina_value_type_string_common_compare(const Eina_Value_Type *type __UNUSED__, c | |||
2112 | } | 2112 | } |
2113 | 2113 | ||
2114 | static Eina_Bool | 2114 | static Eina_Bool |
2115 | _eina_value_type_string_common_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 2115 | _eina_value_type_string_common_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
2116 | { | 2116 | { |
2117 | const char *v = *(const char **)type_mem; | 2117 | const char *v = *(const char **)type_mem; |
2118 | 2118 | ||
@@ -2237,14 +2237,14 @@ _eina_value_type_string_common_convert_to(const Eina_Value_Type *type __UNUSED__ | |||
2237 | } | 2237 | } |
2238 | 2238 | ||
2239 | static Eina_Bool | 2239 | static Eina_Bool |
2240 | _eina_value_type_string_common_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 2240 | _eina_value_type_string_common_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
2241 | { | 2241 | { |
2242 | memcpy(ptr, mem, sizeof(const char *)); | 2242 | memcpy(ptr, mem, sizeof(const char *)); |
2243 | return EINA_TRUE; | 2243 | return EINA_TRUE; |
2244 | } | 2244 | } |
2245 | 2245 | ||
2246 | static Eina_Bool | 2246 | static Eina_Bool |
2247 | _eina_value_type_stringshare_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 2247 | _eina_value_type_stringshare_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2248 | { | 2248 | { |
2249 | const char **tmem = mem; | 2249 | const char **tmem = mem; |
2250 | if (*tmem) | 2250 | if (*tmem) |
@@ -2256,7 +2256,7 @@ _eina_value_type_stringshare_flush(const Eina_Value_Type *type __UNUSED__, void | |||
2256 | } | 2256 | } |
2257 | 2257 | ||
2258 | static Eina_Bool | 2258 | static Eina_Bool |
2259 | _eina_value_type_stringshare_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 2259 | _eina_value_type_stringshare_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
2260 | { | 2260 | { |
2261 | const char * const*s = src; | 2261 | const char * const*s = src; |
2262 | const char **d = dst; | 2262 | const char **d = dst; |
@@ -2265,21 +2265,21 @@ _eina_value_type_stringshare_copy(const Eina_Value_Type *type __UNUSED__, const | |||
2265 | } | 2265 | } |
2266 | 2266 | ||
2267 | static Eina_Bool | 2267 | static Eina_Bool |
2268 | _eina_value_type_stringshare_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 2268 | _eina_value_type_stringshare_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
2269 | { | 2269 | { |
2270 | const char *str = va_arg(args, const char *); | 2270 | const char *str = va_arg(args, const char *); |
2271 | return eina_stringshare_replace((const char **)mem, str); | 2271 | return eina_stringshare_replace((const char **)mem, str); |
2272 | } | 2272 | } |
2273 | 2273 | ||
2274 | static Eina_Bool | 2274 | static Eina_Bool |
2275 | _eina_value_type_stringshare_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 2275 | _eina_value_type_stringshare_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
2276 | { | 2276 | { |
2277 | const char * const *str = ptr; | 2277 | const char * const *str = ptr; |
2278 | return eina_stringshare_replace((const char **)mem, *str); | 2278 | return eina_stringshare_replace((const char **)mem, *str); |
2279 | } | 2279 | } |
2280 | 2280 | ||
2281 | static Eina_Bool | 2281 | static Eina_Bool |
2282 | _eina_value_type_string_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 2282 | _eina_value_type_string_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2283 | { | 2283 | { |
2284 | char **tmem = mem; | 2284 | char **tmem = mem; |
2285 | if (*tmem) | 2285 | if (*tmem) |
@@ -2291,7 +2291,7 @@ _eina_value_type_string_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
2291 | } | 2291 | } |
2292 | 2292 | ||
2293 | static Eina_Bool | 2293 | static Eina_Bool |
2294 | _eina_value_type_string_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 2294 | _eina_value_type_string_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
2295 | { | 2295 | { |
2296 | const char * const *s = src; | 2296 | const char * const *s = src; |
2297 | char **d = dst; | 2297 | char **d = dst; |
@@ -2310,7 +2310,7 @@ _eina_value_type_string_copy(const Eina_Value_Type *type __UNUSED__, const void | |||
2310 | } | 2310 | } |
2311 | 2311 | ||
2312 | static Eina_Bool | 2312 | static Eina_Bool |
2313 | _eina_value_type_string_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 2313 | _eina_value_type_string_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
2314 | { | 2314 | { |
2315 | char **tmem = mem; | 2315 | char **tmem = mem; |
2316 | const char *str = va_arg(args, const char *); | 2316 | const char *str = va_arg(args, const char *); |
@@ -2336,7 +2336,7 @@ _eina_value_type_string_vset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
2336 | } | 2336 | } |
2337 | 2337 | ||
2338 | static Eina_Bool | 2338 | static Eina_Bool |
2339 | _eina_value_type_string_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 2339 | _eina_value_type_string_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
2340 | { | 2340 | { |
2341 | char **tmem = mem; | 2341 | char **tmem = mem; |
2342 | const char * const *str = ptr; | 2342 | const char * const *str = ptr; |
@@ -2362,7 +2362,7 @@ _eina_value_type_string_pset(const Eina_Value_Type *type __UNUSED__, void *mem, | |||
2362 | } | 2362 | } |
2363 | 2363 | ||
2364 | static Eina_Bool | 2364 | static Eina_Bool |
2365 | _eina_value_type_array_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 2365 | _eina_value_type_array_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2366 | { | 2366 | { |
2367 | memset(mem, 0, sizeof(Eina_Value_Array)); | 2367 | memset(mem, 0, sizeof(Eina_Value_Array)); |
2368 | return EINA_TRUE; | 2368 | return EINA_TRUE; |
@@ -2390,7 +2390,7 @@ _eina_value_type_array_flush_elements(Eina_Value_Array *tmem) | |||
2390 | } | 2390 | } |
2391 | 2391 | ||
2392 | static Eina_Bool | 2392 | static Eina_Bool |
2393 | _eina_value_type_array_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 2393 | _eina_value_type_array_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2394 | { | 2394 | { |
2395 | Eina_Value_Array *tmem = mem; | 2395 | Eina_Value_Array *tmem = mem; |
2396 | Eina_Bool ret =_eina_value_type_array_flush_elements(tmem); | 2396 | Eina_Bool ret =_eina_value_type_array_flush_elements(tmem); |
@@ -2402,7 +2402,7 @@ _eina_value_type_array_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
2402 | } | 2402 | } |
2403 | 2403 | ||
2404 | static Eina_Bool | 2404 | static Eina_Bool |
2405 | _eina_value_type_array_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 2405 | _eina_value_type_array_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
2406 | { | 2406 | { |
2407 | const Eina_Value_Type *subtype; | 2407 | const Eina_Value_Type *subtype; |
2408 | const Eina_Value_Array *s = src; | 2408 | const Eina_Value_Array *s = src; |
@@ -2454,7 +2454,7 @@ _eina_value_type_array_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
2454 | } | 2454 | } |
2455 | 2455 | ||
2456 | static int | 2456 | static int |
2457 | _eina_value_type_array_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 2457 | _eina_value_type_array_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
2458 | { | 2458 | { |
2459 | const Eina_Value_Type *subtype; | 2459 | const Eina_Value_Type *subtype; |
2460 | const Eina_Value_Array *eva_a = a, *eva_b = b; | 2460 | const Eina_Value_Array *eva_a = a, *eva_b = b; |
@@ -2512,7 +2512,7 @@ _eina_value_type_array_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
2512 | } | 2512 | } |
2513 | 2513 | ||
2514 | static Eina_Bool | 2514 | static Eina_Bool |
2515 | _eina_value_type_array_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 2515 | _eina_value_type_array_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
2516 | { | 2516 | { |
2517 | const Eina_Value_Array *tmem = type_mem; | 2517 | const Eina_Value_Array *tmem = type_mem; |
2518 | Eina_Bool ret = EINA_FALSE; | 2518 | Eina_Bool ret = EINA_FALSE; |
@@ -2680,7 +2680,7 @@ _eina_value_type_array_vset(const Eina_Value_Type *type, void *mem, va_list args | |||
2680 | } | 2680 | } |
2681 | 2681 | ||
2682 | static Eina_Bool | 2682 | static Eina_Bool |
2683 | _eina_value_type_array_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 2683 | _eina_value_type_array_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
2684 | { | 2684 | { |
2685 | memcpy(ptr, mem, sizeof(Eina_Value_Array)); | 2685 | memcpy(ptr, mem, sizeof(Eina_Value_Array)); |
2686 | return EINA_TRUE; | 2686 | return EINA_TRUE; |
@@ -2702,7 +2702,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_ARRAY = { | |||
2702 | }; | 2702 | }; |
2703 | 2703 | ||
2704 | static Eina_Bool | 2704 | static Eina_Bool |
2705 | _eina_value_type_list_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 2705 | _eina_value_type_list_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2706 | { | 2706 | { |
2707 | memset(mem, 0, sizeof(Eina_Value_List)); | 2707 | memset(mem, 0, sizeof(Eina_Value_List)); |
2708 | return EINA_TRUE; | 2708 | return EINA_TRUE; |
@@ -2728,7 +2728,7 @@ _eina_value_type_list_flush_elements(Eina_Value_List *tmem) | |||
2728 | } | 2728 | } |
2729 | 2729 | ||
2730 | static Eina_Bool | 2730 | static Eina_Bool |
2731 | _eina_value_type_list_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 2731 | _eina_value_type_list_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
2732 | { | 2732 | { |
2733 | Eina_Value_List *tmem = mem; | 2733 | Eina_Value_List *tmem = mem; |
2734 | Eina_Bool ret =_eina_value_type_list_flush_elements(tmem); | 2734 | Eina_Bool ret =_eina_value_type_list_flush_elements(tmem); |
@@ -2740,7 +2740,7 @@ _eina_value_type_list_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
2740 | } | 2740 | } |
2741 | 2741 | ||
2742 | static Eina_Bool | 2742 | static Eina_Bool |
2743 | _eina_value_type_list_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 2743 | _eina_value_type_list_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
2744 | { | 2744 | { |
2745 | const Eina_Value_Type *subtype; | 2745 | const Eina_Value_Type *subtype; |
2746 | const Eina_Value_List *s = src; | 2746 | const Eina_Value_List *s = src; |
@@ -2788,7 +2788,7 @@ _eina_value_type_list_copy(const Eina_Value_Type *type __UNUSED__, const void *s | |||
2788 | } | 2788 | } |
2789 | 2789 | ||
2790 | static int | 2790 | static int |
2791 | _eina_value_type_list_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 2791 | _eina_value_type_list_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
2792 | { | 2792 | { |
2793 | const Eina_Value_Type *subtype; | 2793 | const Eina_Value_Type *subtype; |
2794 | const Eina_Value_List *eva_a = a, *eva_b = b; | 2794 | const Eina_Value_List *eva_a = a, *eva_b = b; |
@@ -2837,7 +2837,7 @@ _eina_value_type_list_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
2837 | } | 2837 | } |
2838 | 2838 | ||
2839 | static Eina_Bool | 2839 | static Eina_Bool |
2840 | _eina_value_type_list_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 2840 | _eina_value_type_list_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
2841 | { | 2841 | { |
2842 | const Eina_Value_List *tmem = type_mem; | 2842 | const Eina_Value_List *tmem = type_mem; |
2843 | Eina_Bool ret = EINA_FALSE; | 2843 | Eina_Bool ret = EINA_FALSE; |
@@ -2999,7 +2999,7 @@ _eina_value_type_list_vset(const Eina_Value_Type *type, void *mem, va_list args) | |||
2999 | } | 2999 | } |
3000 | 3000 | ||
3001 | static Eina_Bool | 3001 | static Eina_Bool |
3002 | _eina_value_type_list_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 3002 | _eina_value_type_list_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
3003 | { | 3003 | { |
3004 | memcpy(ptr, mem, sizeof(Eina_Value_List)); | 3004 | memcpy(ptr, mem, sizeof(Eina_Value_List)); |
3005 | return EINA_TRUE; | 3005 | return EINA_TRUE; |
@@ -3021,7 +3021,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_LIST = { | |||
3021 | }; | 3021 | }; |
3022 | 3022 | ||
3023 | static Eina_Bool | 3023 | static Eina_Bool |
3024 | _eina_value_type_hash_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 3024 | _eina_value_type_hash_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
3025 | { | 3025 | { |
3026 | memset(mem, 0, sizeof(Eina_Value_Hash)); | 3026 | memset(mem, 0, sizeof(Eina_Value_Hash)); |
3027 | return EINA_TRUE; | 3027 | return EINA_TRUE; |
@@ -3034,7 +3034,7 @@ struct _eina_value_type_hash_flush_each_ctx | |||
3034 | }; | 3034 | }; |
3035 | 3035 | ||
3036 | static Eina_Bool | 3036 | static Eina_Bool |
3037 | _eina_value_type_hash_flush_each(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *mem, void *user_data) | 3037 | _eina_value_type_hash_flush_each(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *mem, void *user_data) |
3038 | { | 3038 | { |
3039 | struct _eina_value_type_hash_flush_each_ctx *ctx = user_data; | 3039 | struct _eina_value_type_hash_flush_each_ctx *ctx = user_data; |
3040 | ctx->ret &= eina_value_type_flush(ctx->subtype, mem); | 3040 | ctx->ret &= eina_value_type_flush(ctx->subtype, mem); |
@@ -3059,7 +3059,7 @@ _eina_value_type_hash_flush_elements(Eina_Value_Hash *tmem) | |||
3059 | } | 3059 | } |
3060 | 3060 | ||
3061 | static Eina_Bool | 3061 | static Eina_Bool |
3062 | _eina_value_type_hash_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 3062 | _eina_value_type_hash_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
3063 | { | 3063 | { |
3064 | Eina_Value_Hash *tmem = mem; | 3064 | Eina_Value_Hash *tmem = mem; |
3065 | Eina_Bool ret =_eina_value_type_hash_flush_elements(tmem); | 3065 | Eina_Bool ret =_eina_value_type_hash_flush_elements(tmem); |
@@ -3105,7 +3105,7 @@ struct _eina_value_type_hash_copy_each_ctx | |||
3105 | }; | 3105 | }; |
3106 | 3106 | ||
3107 | static Eina_Bool | 3107 | static Eina_Bool |
3108 | _eina_value_type_hash_copy_each(const Eina_Hash *hash __UNUSED__, const void *key, void *_ptr, void *user_data) | 3108 | _eina_value_type_hash_copy_each(const Eina_Hash *hash EINA_UNUSED, const void *key, void *_ptr, void *user_data) |
3109 | { | 3109 | { |
3110 | struct _eina_value_type_hash_copy_each_ctx *ctx = user_data; | 3110 | struct _eina_value_type_hash_copy_each_ctx *ctx = user_data; |
3111 | const void *ptr = _ptr; | 3111 | const void *ptr = _ptr; |
@@ -3132,7 +3132,7 @@ _eina_value_type_hash_copy_each(const Eina_Hash *hash __UNUSED__, const void *ke | |||
3132 | } | 3132 | } |
3133 | 3133 | ||
3134 | static Eina_Bool | 3134 | static Eina_Bool |
3135 | _eina_value_type_hash_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 3135 | _eina_value_type_hash_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
3136 | { | 3136 | { |
3137 | const Eina_Value_Hash *s = src; | 3137 | const Eina_Value_Hash *s = src; |
3138 | Eina_Value_Hash *d = dst; | 3138 | Eina_Value_Hash *d = dst; |
@@ -3173,7 +3173,7 @@ struct _eina_value_type_hash_compare_each_ctx | |||
3173 | }; | 3173 | }; |
3174 | 3174 | ||
3175 | static Eina_Bool | 3175 | static Eina_Bool |
3176 | _eina_value_type_hash_compare_each(const Eina_Hash *hash __UNUSED__, const void *key, void *_ptr, void *user_data) | 3176 | _eina_value_type_hash_compare_each(const Eina_Hash *hash EINA_UNUSED, const void *key, void *_ptr, void *user_data) |
3177 | { | 3177 | { |
3178 | struct _eina_value_type_hash_compare_each_ctx *ctx = user_data; | 3178 | struct _eina_value_type_hash_compare_each_ctx *ctx = user_data; |
3179 | const void *self_ptr = _ptr; | 3179 | const void *self_ptr = _ptr; |
@@ -3184,7 +3184,7 @@ _eina_value_type_hash_compare_each(const Eina_Hash *hash __UNUSED__, const void | |||
3184 | } | 3184 | } |
3185 | 3185 | ||
3186 | static int | 3186 | static int |
3187 | _eina_value_type_hash_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 3187 | _eina_value_type_hash_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
3188 | { | 3188 | { |
3189 | const Eina_Value_Hash *eva_a = a, *eva_b = b; | 3189 | const Eina_Value_Hash *eva_a = a, *eva_b = b; |
3190 | struct _eina_value_type_hash_compare_each_ctx ctx = { | 3190 | struct _eina_value_type_hash_compare_each_ctx ctx = { |
@@ -3226,7 +3226,7 @@ _eina_value_type_hash_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
3226 | } | 3226 | } |
3227 | 3227 | ||
3228 | static Eina_Bool | 3228 | static Eina_Bool |
3229 | _eina_value_type_hash_find_first(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *ptr, void *user_data) | 3229 | _eina_value_type_hash_find_first(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *ptr, void *user_data) |
3230 | { | 3230 | { |
3231 | void **ret = user_data; | 3231 | void **ret = user_data; |
3232 | *ret = ptr; | 3232 | *ret = ptr; |
@@ -3242,7 +3242,7 @@ struct _eina_value_type_hash_convert_to_string_each_ctx | |||
3242 | }; | 3242 | }; |
3243 | 3243 | ||
3244 | static Eina_Bool | 3244 | static Eina_Bool |
3245 | _eina_value_type_hash_convert_to_string_each(const Eina_Hash *hash __UNUSED__, const void *_key, void *_ptr, void *user_data) | 3245 | _eina_value_type_hash_convert_to_string_each(const Eina_Hash *hash EINA_UNUSED, const void *_key, void *_ptr, void *user_data) |
3246 | { | 3246 | { |
3247 | struct _eina_value_type_hash_convert_to_string_each_ctx *ctx = user_data; | 3247 | struct _eina_value_type_hash_convert_to_string_each_ctx *ctx = user_data; |
3248 | const char *key = _key; | 3248 | const char *key = _key; |
@@ -3274,7 +3274,7 @@ _eina_value_type_hash_convert_to_string_each(const Eina_Hash *hash __UNUSED__, c | |||
3274 | } | 3274 | } |
3275 | 3275 | ||
3276 | static Eina_Bool | 3276 | static Eina_Bool |
3277 | _eina_value_type_hash_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 3277 | _eina_value_type_hash_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
3278 | { | 3278 | { |
3279 | const Eina_Value_Hash *tmem = type_mem; | 3279 | const Eina_Value_Hash *tmem = type_mem; |
3280 | Eina_Bool ret = EINA_FALSE; | 3280 | Eina_Bool ret = EINA_FALSE; |
@@ -3377,7 +3377,7 @@ _eina_value_type_hash_vset(const Eina_Value_Type *type, void *mem, va_list args) | |||
3377 | } | 3377 | } |
3378 | 3378 | ||
3379 | static Eina_Bool | 3379 | static Eina_Bool |
3380 | _eina_value_type_hash_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 3380 | _eina_value_type_hash_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
3381 | { | 3381 | { |
3382 | memcpy(ptr, mem, sizeof(Eina_Value_Hash)); | 3382 | memcpy(ptr, mem, sizeof(Eina_Value_Hash)); |
3383 | return EINA_TRUE; | 3383 | return EINA_TRUE; |
@@ -3399,20 +3399,20 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_HASH = { | |||
3399 | }; | 3399 | }; |
3400 | 3400 | ||
3401 | static Eina_Bool | 3401 | static Eina_Bool |
3402 | _eina_value_type_timeval_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 3402 | _eina_value_type_timeval_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
3403 | { | 3403 | { |
3404 | memset(mem, 0, sizeof(struct timeval)); | 3404 | memset(mem, 0, sizeof(struct timeval)); |
3405 | return EINA_TRUE; | 3405 | return EINA_TRUE; |
3406 | } | 3406 | } |
3407 | 3407 | ||
3408 | static Eina_Bool | 3408 | static Eina_Bool |
3409 | _eina_value_type_timeval_flush(const Eina_Value_Type *type __UNUSED__, void *mem __UNUSED__) | 3409 | _eina_value_type_timeval_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem EINA_UNUSED) |
3410 | { | 3410 | { |
3411 | return EINA_TRUE; | 3411 | return EINA_TRUE; |
3412 | } | 3412 | } |
3413 | 3413 | ||
3414 | static Eina_Bool | 3414 | static Eina_Bool |
3415 | _eina_value_type_timeval_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 3415 | _eina_value_type_timeval_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
3416 | { | 3416 | { |
3417 | const struct timeval *s = src; | 3417 | const struct timeval *s = src; |
3418 | struct timeval *d = dst; | 3418 | struct timeval *d = dst; |
@@ -3432,7 +3432,7 @@ static inline struct timeval _eina_value_type_timeval_fix(const struct timeval * | |||
3432 | } | 3432 | } |
3433 | 3433 | ||
3434 | static int | 3434 | static int |
3435 | _eina_value_type_timeval_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 3435 | _eina_value_type_timeval_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
3436 | { | 3436 | { |
3437 | struct timeval va = _eina_value_type_timeval_fix(a); | 3437 | struct timeval va = _eina_value_type_timeval_fix(a); |
3438 | struct timeval vb = _eina_value_type_timeval_fix(b); | 3438 | struct timeval vb = _eina_value_type_timeval_fix(b); |
@@ -3451,7 +3451,7 @@ _eina_value_type_timeval_compare(const Eina_Value_Type *type __UNUSED__, const v | |||
3451 | } | 3451 | } |
3452 | 3452 | ||
3453 | static Eina_Bool | 3453 | static Eina_Bool |
3454 | _eina_value_type_timeval_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 3454 | _eina_value_type_timeval_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
3455 | { | 3455 | { |
3456 | struct timeval v = _eina_value_type_timeval_fix(type_mem); | 3456 | struct timeval v = _eina_value_type_timeval_fix(type_mem); |
3457 | 3457 | ||
@@ -3569,7 +3569,7 @@ _eina_value_type_timeval_convert_to(const Eina_Value_Type *type __UNUSED__, cons | |||
3569 | } | 3569 | } |
3570 | 3570 | ||
3571 | static Eina_Bool | 3571 | static Eina_Bool |
3572 | _eina_value_type_timeval_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 3572 | _eina_value_type_timeval_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
3573 | { | 3573 | { |
3574 | struct timeval *tmem = mem; | 3574 | struct timeval *tmem = mem; |
3575 | *tmem = _eina_value_type_timeval_fix(ptr); | 3575 | *tmem = _eina_value_type_timeval_fix(ptr); |
@@ -3585,7 +3585,7 @@ _eina_value_type_timeval_vset(const Eina_Value_Type *type, void *mem, va_list ar | |||
3585 | } | 3585 | } |
3586 | 3586 | ||
3587 | static Eina_Bool | 3587 | static Eina_Bool |
3588 | _eina_value_type_timeval_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 3588 | _eina_value_type_timeval_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
3589 | { | 3589 | { |
3590 | memcpy(ptr, mem, sizeof(struct timeval)); | 3590 | memcpy(ptr, mem, sizeof(struct timeval)); |
3591 | return EINA_TRUE; | 3591 | return EINA_TRUE; |
@@ -3607,7 +3607,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_TIMEVAL = { | |||
3607 | }; | 3607 | }; |
3608 | 3608 | ||
3609 | static Eina_Bool | 3609 | static Eina_Bool |
3610 | _eina_value_type_blob_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 3610 | _eina_value_type_blob_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
3611 | { | 3611 | { |
3612 | memset(mem, 0, sizeof(Eina_Value_Blob)); | 3612 | memset(mem, 0, sizeof(Eina_Value_Blob)); |
3613 | return EINA_TRUE; | 3613 | return EINA_TRUE; |
@@ -3624,7 +3624,7 @@ _eina_value_type_blob_ops_get(const Eina_Value_Blob *blob) | |||
3624 | } | 3624 | } |
3625 | 3625 | ||
3626 | static Eina_Bool | 3626 | static Eina_Bool |
3627 | _eina_value_type_blob_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 3627 | _eina_value_type_blob_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
3628 | { | 3628 | { |
3629 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(mem); | 3629 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(mem); |
3630 | Eina_Value_Blob *tmem = mem; | 3630 | Eina_Value_Blob *tmem = mem; |
@@ -3636,7 +3636,7 @@ _eina_value_type_blob_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
3636 | } | 3636 | } |
3637 | 3637 | ||
3638 | static Eina_Bool | 3638 | static Eina_Bool |
3639 | _eina_value_type_blob_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 3639 | _eina_value_type_blob_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
3640 | { | 3640 | { |
3641 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(src); | 3641 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(src); |
3642 | const Eina_Value_Blob *s = src; | 3642 | const Eina_Value_Blob *s = src; |
@@ -3655,7 +3655,7 @@ _eina_value_type_blob_copy(const Eina_Value_Type *type __UNUSED__, const void *s | |||
3655 | } | 3655 | } |
3656 | 3656 | ||
3657 | static int | 3657 | static int |
3658 | _eina_value_type_blob_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 3658 | _eina_value_type_blob_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
3659 | { | 3659 | { |
3660 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(a); | 3660 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(a); |
3661 | const Eina_Value_Blob *ta = a, *tb = b; | 3661 | const Eina_Value_Blob *ta = a, *tb = b; |
@@ -3677,7 +3677,7 @@ _eina_value_type_blob_compare(const Eina_Value_Type *type __UNUSED__, const void | |||
3677 | } | 3677 | } |
3678 | 3678 | ||
3679 | static Eina_Bool | 3679 | static Eina_Bool |
3680 | _eina_value_type_blob_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 3680 | _eina_value_type_blob_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
3681 | { | 3681 | { |
3682 | const Eina_Value_Blob *tmem = type_mem; | 3682 | const Eina_Value_Blob *tmem = type_mem; |
3683 | 3683 | ||
@@ -3832,7 +3832,7 @@ _eina_value_type_blob_convert_from(const Eina_Value_Type *type, const Eina_Value | |||
3832 | } | 3832 | } |
3833 | 3833 | ||
3834 | static Eina_Bool | 3834 | static Eina_Bool |
3835 | _eina_value_type_blob_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 3835 | _eina_value_type_blob_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
3836 | { | 3836 | { |
3837 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(mem); | 3837 | const Eina_Value_Blob_Operations *ops = _eina_value_type_blob_ops_get(mem); |
3838 | Eina_Value_Blob *tmem = mem; | 3838 | Eina_Value_Blob *tmem = mem; |
@@ -3862,7 +3862,7 @@ _eina_value_type_blob_vset(const Eina_Value_Type *type, void *mem, va_list args) | |||
3862 | } | 3862 | } |
3863 | 3863 | ||
3864 | static Eina_Bool | 3864 | static Eina_Bool |
3865 | _eina_value_type_blob_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 3865 | _eina_value_type_blob_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
3866 | { | 3866 | { |
3867 | memcpy(ptr, mem, sizeof(Eina_Value_Blob)); | 3867 | memcpy(ptr, mem, sizeof(Eina_Value_Blob)); |
3868 | return EINA_TRUE; | 3868 | return EINA_TRUE; |
@@ -3891,7 +3891,7 @@ _eina_value_struct_operations_binsearch_cmp(const void *pa, const void *pb) | |||
3891 | } | 3891 | } |
3892 | 3892 | ||
3893 | static const Eina_Value_Struct_Member * | 3893 | static const Eina_Value_Struct_Member * |
3894 | _eina_value_struct_operations_binsearch_find_member(const Eina_Value_Struct_Operations *ops __UNUSED__, const Eina_Value_Struct_Desc *desc, const char *name) | 3894 | _eina_value_struct_operations_binsearch_find_member(const Eina_Value_Struct_Operations *ops EINA_UNUSED, const Eina_Value_Struct_Desc *desc, const char *name) |
3895 | { | 3895 | { |
3896 | unsigned int count = desc->member_count; | 3896 | unsigned int count = desc->member_count; |
3897 | Eina_Value_Struct_Member search; | 3897 | Eina_Value_Struct_Member search; |
@@ -3918,7 +3918,7 @@ static Eina_Value_Struct_Operations _EINA_VALUE_STRUCT_OPERATIONS_BINSEARCH = { | |||
3918 | }; | 3918 | }; |
3919 | 3919 | ||
3920 | static const Eina_Value_Struct_Member * | 3920 | static const Eina_Value_Struct_Member * |
3921 | _eina_value_struct_operations_stringshare_find_member(const Eina_Value_Struct_Operations *ops __UNUSED__, const Eina_Value_Struct_Desc *desc, const char *name) | 3921 | _eina_value_struct_operations_stringshare_find_member(const Eina_Value_Struct_Operations *ops EINA_UNUSED, const Eina_Value_Struct_Desc *desc, const char *name) |
3922 | { | 3922 | { |
3923 | const Eina_Value_Struct_Member *itr = desc->members; | 3923 | const Eina_Value_Struct_Member *itr = desc->members; |
3924 | 3924 | ||
@@ -4019,7 +4019,7 @@ eina_value_struct_member_find(const Eina_Value_Struct *st, const char *name) | |||
4019 | } | 4019 | } |
4020 | 4020 | ||
4021 | static Eina_Bool | 4021 | static Eina_Bool |
4022 | _eina_value_type_struct_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 4022 | _eina_value_type_struct_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
4023 | { | 4023 | { |
4024 | memset(mem, 0, sizeof(Eina_Value_Struct)); | 4024 | memset(mem, 0, sizeof(Eina_Value_Struct)); |
4025 | return EINA_TRUE; | 4025 | return EINA_TRUE; |
@@ -4040,7 +4040,7 @@ _eina_value_type_struct_flush_member(const Eina_Value_Struct_Member *member, Ein | |||
4040 | } | 4040 | } |
4041 | 4041 | ||
4042 | static Eina_Bool | 4042 | static Eina_Bool |
4043 | _eina_value_type_struct_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 4043 | _eina_value_type_struct_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
4044 | { | 4044 | { |
4045 | const Eina_Value_Struct_Operations *ops; | 4045 | const Eina_Value_Struct_Operations *ops; |
4046 | const Eina_Value_Struct_Member *itr; | 4046 | const Eina_Value_Struct_Member *itr; |
@@ -4087,7 +4087,7 @@ _eina_value_type_struct_copy_member(const Eina_Value_Struct_Member *member, cons | |||
4087 | } | 4087 | } |
4088 | 4088 | ||
4089 | static Eina_Bool | 4089 | static Eina_Bool |
4090 | _eina_value_type_struct_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 4090 | _eina_value_type_struct_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
4091 | { | 4091 | { |
4092 | const Eina_Value_Struct_Operations *ops; | 4092 | const Eina_Value_Struct_Operations *ops; |
4093 | const Eina_Value_Struct_Member *itr; | 4093 | const Eina_Value_Struct_Member *itr; |
@@ -4158,7 +4158,7 @@ _eina_value_type_struct_compare_member(const Eina_Value_Struct_Member *member, c | |||
4158 | } | 4158 | } |
4159 | 4159 | ||
4160 | static int | 4160 | static int |
4161 | _eina_value_type_struct_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 4161 | _eina_value_type_struct_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
4162 | { | 4162 | { |
4163 | const Eina_Value_Struct_Operations *ops = _eina_value_type_struct_ops_get(a); | 4163 | const Eina_Value_Struct_Operations *ops = _eina_value_type_struct_ops_get(a); |
4164 | const Eina_Value_Struct *ta = a, *tb = b; | 4164 | const Eina_Value_Struct *ta = a, *tb = b; |
@@ -4231,7 +4231,7 @@ _eina_value_type_struct_convert_to_string_member(const Eina_Value_Struct *st, co | |||
4231 | } | 4231 | } |
4232 | 4232 | ||
4233 | static Eina_Bool | 4233 | static Eina_Bool |
4234 | _eina_value_type_struct_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 4234 | _eina_value_type_struct_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
4235 | { | 4235 | { |
4236 | const Eina_Value_Struct *tmem = type_mem; | 4236 | const Eina_Value_Struct *tmem = type_mem; |
4237 | 4237 | ||
@@ -4420,7 +4420,7 @@ _eina_value_type_struct_vset(const Eina_Value_Type *type, void *mem, va_list arg | |||
4420 | } | 4420 | } |
4421 | 4421 | ||
4422 | static Eina_Bool | 4422 | static Eina_Bool |
4423 | _eina_value_type_struct_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 4423 | _eina_value_type_struct_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
4424 | { | 4424 | { |
4425 | memcpy(ptr, mem, sizeof(Eina_Value_Struct)); | 4425 | memcpy(ptr, mem, sizeof(Eina_Value_Struct)); |
4426 | return EINA_TRUE; | 4426 | return EINA_TRUE; |
@@ -4443,7 +4443,7 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_STRUCT = { | |||
4443 | 4443 | ||
4444 | /* no model for now | 4444 | /* no model for now |
4445 | static Eina_Bool | 4445 | static Eina_Bool |
4446 | _eina_value_type_model_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | 4446 | _eina_value_type_model_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
4447 | { | 4447 | { |
4448 | Eina_Model **tmem = mem; | 4448 | Eina_Model **tmem = mem; |
4449 | *tmem = NULL; | 4449 | *tmem = NULL; |
@@ -4451,7 +4451,7 @@ _eina_value_type_model_setup(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
4451 | } | 4451 | } |
4452 | 4452 | ||
4453 | static Eina_Bool | 4453 | static Eina_Bool |
4454 | _eina_value_type_model_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | 4454 | _eina_value_type_model_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem) |
4455 | { | 4455 | { |
4456 | Eina_Model **tmem = mem; | 4456 | Eina_Model **tmem = mem; |
4457 | if (*tmem) | 4457 | if (*tmem) |
@@ -4463,7 +4463,7 @@ _eina_value_type_model_flush(const Eina_Value_Type *type __UNUSED__, void *mem) | |||
4463 | } | 4463 | } |
4464 | 4464 | ||
4465 | static Eina_Bool | 4465 | static Eina_Bool |
4466 | _eina_value_type_model_copy(const Eina_Value_Type *type __UNUSED__, const void *src, void *dst) | 4466 | _eina_value_type_model_copy(const Eina_Value_Type *type EINA_UNUSED, const void *src, void *dst) |
4467 | { | 4467 | { |
4468 | const Eina_Model * const *s = src; | 4468 | const Eina_Model * const *s = src; |
4469 | Eina_Model **d = dst; | 4469 | Eina_Model **d = dst; |
@@ -4475,7 +4475,7 @@ _eina_value_type_model_copy(const Eina_Value_Type *type __UNUSED__, const void * | |||
4475 | } | 4475 | } |
4476 | 4476 | ||
4477 | static int | 4477 | static int |
4478 | _eina_value_type_model_compare(const Eina_Value_Type *type __UNUSED__, const void *a, const void *b) | 4478 | _eina_value_type_model_compare(const Eina_Value_Type *type EINA_UNUSED, const void *a, const void *b) |
4479 | { | 4479 | { |
4480 | const Eina_Model * const *ta = a; | 4480 | const Eina_Model * const *ta = a; |
4481 | const Eina_Model * const *tb = b; | 4481 | const Eina_Model * const *tb = b; |
@@ -4487,7 +4487,7 @@ _eina_value_type_model_compare(const Eina_Value_Type *type __UNUSED__, const voi | |||
4487 | } | 4487 | } |
4488 | 4488 | ||
4489 | static Eina_Bool | 4489 | static Eina_Bool |
4490 | _eina_value_type_model_convert_to(const Eina_Value_Type *type __UNUSED__, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) | 4490 | _eina_value_type_model_convert_to(const Eina_Value_Type *type EINA_UNUSED, const Eina_Value_Type *convert, const void *type_mem, void *convert_mem) |
4491 | { | 4491 | { |
4492 | const Eina_Model *v = *(const Eina_Model **)type_mem; | 4492 | const Eina_Model *v = *(const Eina_Model **)type_mem; |
4493 | 4493 | ||
@@ -4511,7 +4511,7 @@ _eina_value_type_model_convert_to(const Eina_Value_Type *type __UNUSED__, const | |||
4511 | } | 4511 | } |
4512 | 4512 | ||
4513 | static Eina_Bool | 4513 | static Eina_Bool |
4514 | _eina_value_type_model_vset(const Eina_Value_Type *type __UNUSED__, void *mem, va_list args) | 4514 | _eina_value_type_model_vset(const Eina_Value_Type *type EINA_UNUSED, void *mem, va_list args) |
4515 | { | 4515 | { |
4516 | Eina_Model **tmem = mem, *tmp; | 4516 | Eina_Model **tmem = mem, *tmp; |
4517 | 4517 | ||
@@ -4526,7 +4526,7 @@ _eina_value_type_model_vset(const Eina_Value_Type *type __UNUSED__, void *mem, v | |||
4526 | } | 4526 | } |
4527 | 4527 | ||
4528 | static Eina_Bool | 4528 | static Eina_Bool |
4529 | _eina_value_type_model_pset(const Eina_Value_Type *type __UNUSED__, void *mem, const void *ptr) | 4529 | _eina_value_type_model_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, const void *ptr) |
4530 | { | 4530 | { |
4531 | Eina_Model **tmem = mem; | 4531 | Eina_Model **tmem = mem; |
4532 | Eina_Model **p = (Eina_Model **)ptr; | 4532 | Eina_Model **p = (Eina_Model **)ptr; |
@@ -4543,7 +4543,7 @@ _eina_value_type_model_pset(const Eina_Value_Type *type __UNUSED__, void *mem, c | |||
4543 | } | 4543 | } |
4544 | 4544 | ||
4545 | static Eina_Bool | 4545 | static Eina_Bool |
4546 | _eina_value_type_model_pget(const Eina_Value_Type *type __UNUSED__, const void *mem, void *ptr) | 4546 | _eina_value_type_model_pget(const Eina_Value_Type *type EINA_UNUSED, const void *mem, void *ptr) |
4547 | { | 4547 | { |
4548 | Eina_Model **tmem = (Eina_Model **)mem; | 4548 | Eina_Model **tmem = (Eina_Model **)mem; |
4549 | Eina_Model **p = ptr; | 4549 | Eina_Model **p = ptr; |
@@ -4787,13 +4787,13 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_BASICS[] = { | |||
4787 | }; | 4787 | }; |
4788 | 4788 | ||
4789 | static void | 4789 | static void |
4790 | _eina_value_blob_operations_malloc_free(const Eina_Value_Blob_Operations *ops __UNUSED__, void *memory, size_t size __UNUSED__) | 4790 | _eina_value_blob_operations_malloc_free(const Eina_Value_Blob_Operations *ops EINA_UNUSED, void *memory, size_t size EINA_UNUSED) |
4791 | { | 4791 | { |
4792 | free(memory); | 4792 | free(memory); |
4793 | } | 4793 | } |
4794 | 4794 | ||
4795 | static void * | 4795 | static void * |
4796 | _eina_value_blob_operations_malloc_copy(const Eina_Value_Blob_Operations *ops __UNUSED__, const void *memory, size_t size) | 4796 | _eina_value_blob_operations_malloc_copy(const Eina_Value_Blob_Operations *ops EINA_UNUSED, const void *memory, size_t size) |
4797 | { | 4797 | { |
4798 | void *ret = malloc(size); | 4798 | void *ret = malloc(size); |
4799 | if (!ret) | 4799 | if (!ret) |
diff --git a/src/lib/eina/eina_xattr.c b/src/lib/eina/eina_xattr.c index d4ed13965f..581d5e0b33 100644 --- a/src/lib/eina/eina_xattr.c +++ b/src/lib/eina/eina_xattr.c | |||
@@ -140,7 +140,7 @@ _eina_xattr_ls_iterator_next(Eina_Xattr_Iterator *it, void **data) | |||
140 | } | 140 | } |
141 | 141 | ||
142 | static void * | 142 | static void * |
143 | _eina_xattr_ls_iterator_container(Eina_Xattr_Iterator *it __UNUSED__) | 143 | _eina_xattr_ls_iterator_container(Eina_Xattr_Iterator *it EINA_UNUSED) |
144 | { | 144 | { |
145 | return NULL; | 145 | return NULL; |
146 | } | 146 | } |
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am index f507230e7a..2e08f4dd73 100644 --- a/src/lib/eo/Makefile.am +++ b/src/lib/eo/Makefile.am | |||
@@ -8,6 +8,12 @@ AM_CPPFLAGS = \ | |||
8 | @EFL_EO_BUILD@ \ | 8 | @EFL_EO_BUILD@ \ |
9 | @EO_CFLAGS@ | 9 | @EO_CFLAGS@ |
10 | 10 | ||
11 | if HAVE_WINDOWS | ||
12 | AM_CPPFLAGS += \ | ||
13 | -I$(top_srcdir)/src/lib/evil \ | ||
14 | -I$(top_builddir)/src/lib/evil | ||
15 | endif | ||
16 | |||
11 | installed_headerdir = $(includedir)/eo-@VMAJ@ | 17 | installed_headerdir = $(includedir)/eo-@VMAJ@ |
12 | dist_installed_header_DATA = Eo.h | 18 | dist_installed_header_DATA = Eo.h |
13 | 19 | ||
diff --git a/src/lib/evil/dlfcn.c b/src/lib/evil/dlfcn.c index 818cabf014..a877653ec6 100644 --- a/src/lib/evil/dlfcn.c +++ b/src/lib/evil/dlfcn.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #include "Evil.h" | 23 | #include "Evil.h" |
24 | #include "evil_private.h" | ||
24 | 25 | ||
25 | #include "dlfcn.h" | 26 | #include "dlfcn.h" |
26 | 27 | ||
@@ -57,7 +58,7 @@ get_last_error(char *desc) | |||
57 | } | 58 | } |
58 | 59 | ||
59 | void * | 60 | void * |
60 | dlopen(const char* path, int mode __UNUSED__) | 61 | dlopen(const char* path, int mode EVIL_UNUSED) |
61 | { | 62 | { |
62 | HMODULE module = NULL; | 63 | HMODULE module = NULL; |
63 | 64 | ||
@@ -190,7 +191,7 @@ dlsym(void *handle, const char *symbol) | |||
190 | } | 191 | } |
191 | 192 | ||
192 | int | 193 | int |
193 | dladdr (const void *addr __UNUSED__, Dl_info *info) | 194 | dladdr (const void *addr EVIL_UNUSED, Dl_info *info) |
194 | { | 195 | { |
195 | TCHAR tpath[PATH_MAX]; | 196 | TCHAR tpath[PATH_MAX]; |
196 | MEMORY_BASIC_INFORMATION mbi; | 197 | MEMORY_BASIC_INFORMATION mbi; |
diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c index 8898357cfc..709eb24fc8 100644 --- a/src/lib/evil/evil_mman.c +++ b/src/lib/evil/evil_mman.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include "evil_private.h" | 24 | #include "evil_private.h" |
25 | #define APICHAR char | 25 | #define APICHAR char |
26 | #include "evil_print.h" | 26 | #include "evil_print.h" |
27 | #include "evil_private.h" | ||
27 | 28 | ||
28 | #ifdef __MINGW32CE__ | 29 | #ifdef __MINGW32CE__ |
29 | # define _get_osfhandle(FILEDES) ((long)FILEDES) | 30 | # define _get_osfhandle(FILEDES) ((long)FILEDES) |
@@ -34,7 +35,7 @@ | |||
34 | 35 | ||
35 | 36 | ||
36 | void * | 37 | void * |
37 | mmap(void *addr __UNUSED__, | 38 | mmap(void *addr EVIL_UNUSED, |
38 | size_t len, | 39 | size_t len, |
39 | int prot, | 40 | int prot, |
40 | int flags, | 41 | int flags, |
@@ -189,7 +190,7 @@ mmap(void *addr __UNUSED__, | |||
189 | 190 | ||
190 | int | 191 | int |
191 | munmap(void *addr, | 192 | munmap(void *addr, |
192 | size_t len __UNUSED__) | 193 | size_t len EVIL_UNUSED) |
193 | { | 194 | { |
194 | #ifdef _WIN32_WCE | 195 | #ifdef _WIN32_WCE |
195 | OSVERSIONINFO os_version; | 196 | OSVERSIONINFO os_version; |
diff --git a/src/lib/evil/evil_private.h b/src/lib/evil/evil_private.h index d46a379d01..0f8b6d193e 100644 --- a/src/lib/evil/evil_private.h +++ b/src/lib/evil/evil_private.h | |||
@@ -6,6 +6,14 @@ | |||
6 | extern "C" { | 6 | extern "C" { |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #ifdef __GNUC__ | ||
10 | # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) | ||
11 | # define EVIL_UNUSED __attribute__ ((__unused__)) | ||
12 | # else | ||
13 | # define EVIL_UNUSED | ||
14 | # endif | ||
15 | #endif | ||
16 | |||
9 | long _evil_systemtime_to_time(SYSTEMTIME st); | 17 | long _evil_systemtime_to_time(SYSTEMTIME st); |
10 | 18 | ||
11 | void _evil_error_display(const char *fct, LONG res); | 19 | void _evil_error_display(const char *fct, LONG res); |
diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c index 594d281159..1aa6f67537 100644 --- a/src/lib/evil/evil_stdio.c +++ b/src/lib/evil/evil_stdio.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | void evil_perror (const char *s __UNUSED__) | 18 | void evil_perror (const char *s EVIL_UNUSED) |
19 | { | 19 | { |
20 | fprintf(stderr, "[Windows CE] error\n"); | 20 | fprintf(stderr, "[Windows CE] error\n"); |
21 | } | 21 | } |
diff --git a/src/lib/evil/evil_string.c b/src/lib/evil/evil_string.c index ffbe308b67..491a880e1a 100644 --- a/src/lib/evil/evil_string.c +++ b/src/lib/evil/evil_string.c | |||
@@ -3,6 +3,7 @@ | |||
3 | #endif /* HAVE_CONFIG_H */ | 3 | #endif /* HAVE_CONFIG_H */ |
4 | 4 | ||
5 | #include "Evil.h" | 5 | #include "Evil.h" |
6 | #include "evil_private.h" | ||
6 | 7 | ||
7 | 8 | ||
8 | #ifdef _WIN32_WCE | 9 | #ifdef _WIN32_WCE |
@@ -12,7 +13,7 @@ | |||
12 | * | 13 | * |
13 | */ | 14 | */ |
14 | 15 | ||
15 | char *strerror (int errnum __UNUSED__) | 16 | char *strerror (int errnum EVIL_UNUSED) |
16 | { | 17 | { |
17 | return "[Windows CE] error\n"; | 18 | return "[Windows CE] error\n"; |
18 | } | 19 | } |
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c index e1498509df..10ef018e1e 100644 --- a/src/lib/evil/evil_unistd.c +++ b/src/lib/evil/evil_unistd.c | |||
@@ -68,7 +68,7 @@ evil_time_get(void) | |||
68 | 68 | ||
69 | #ifdef _MSC_VER | 69 | #ifdef _MSC_VER |
70 | int | 70 | int |
71 | evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__) | 71 | evil_gettimeofday(struct timeval *tp, void *tzp EVIL_UNUSED) |
72 | { | 72 | { |
73 | LARGE_INTEGER count; | 73 | LARGE_INTEGER count; |
74 | LONGLONG diff; | 74 | LONGLONG diff; |
@@ -423,7 +423,7 @@ evil_pipe(int *fds) | |||
423 | 423 | ||
424 | #ifdef _WIN32_WCE | 424 | #ifdef _WIN32_WCE |
425 | 425 | ||
426 | int execvp (const char *file __UNUSED__, char *const argv[] __UNUSED__) | 426 | int execvp (const char *file EVIL_UNUSED, char *const argv[] EVIL_UNUSED) |
427 | { | 427 | { |
428 | return 1; | 428 | return 1; |
429 | } | 429 | } |
diff --git a/src/modules/eina/mp/buddy/eina_buddy.c b/src/modules/eina/mp/buddy/eina_buddy.c index 7d830dbfbb..8344c9db59 100644 --- a/src/modules/eina/mp/buddy/eina_buddy.c +++ b/src/modules/eina/mp/buddy/eina_buddy.c | |||
@@ -80,8 +80,8 @@ static inline void *_get_offset(Buddy *b, Block *block) | |||
80 | return ret; | 80 | return ret; |
81 | } | 81 | } |
82 | 82 | ||
83 | static void *_init(__UNUSED__ const char *context, | 83 | static void *_init(EINA_UNUSED const char *context, |
84 | __UNUSED__ const char *options, | 84 | EINA_UNUSED const char *options, |
85 | va_list args) | 85 | va_list args) |
86 | { | 86 | { |
87 | Buddy *b; | 87 | Buddy *b; |
diff --git a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c index e56df4cee6..c3985c2d68 100644 --- a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c +++ b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c | |||
@@ -100,7 +100,7 @@ struct _Chained_Pool | |||
100 | }; | 100 | }; |
101 | 101 | ||
102 | static inline Eina_Rbtree_Direction | 102 | static inline Eina_Rbtree_Direction |
103 | _eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, __UNUSED__ void *data) | 103 | _eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, EINA_UNUSED void *data) |
104 | { | 104 | { |
105 | if (left < right) return EINA_RBTREE_LEFT; | 105 | if (left < right) return EINA_RBTREE_LEFT; |
106 | return EINA_RBTREE_RIGHT; | 106 | return EINA_RBTREE_RIGHT; |
@@ -108,7 +108,7 @@ _eina_chained_mp_pool_cmp(const Eina_Rbtree *left, const Eina_Rbtree *right, __U | |||
108 | 108 | ||
109 | static inline int | 109 | static inline int |
110 | _eina_chained_mp_pool_key_cmp(const Eina_Rbtree *node, const void *key, | 110 | _eina_chained_mp_pool_key_cmp(const Eina_Rbtree *node, const void *key, |
111 | __UNUSED__ int length, __UNUSED__ void *data) | 111 | EINA_UNUSED int length, EINA_UNUSED void *data) |
112 | { | 112 | { |
113 | const Chained_Pool *r = EINA_RBTREE_CONTAINER_GET(node, const Chained_Pool); | 113 | const Chained_Pool *r = EINA_RBTREE_CONTAINER_GET(node, const Chained_Pool); |
114 | 114 | ||
@@ -256,7 +256,7 @@ _eina_chained_mempool_free_in(Chained_Mempool *pool, Chained_Pool *p, void *ptr) | |||
256 | } | 256 | } |
257 | 257 | ||
258 | static void * | 258 | static void * |
259 | eina_chained_mempool_malloc(void *data, __UNUSED__ unsigned int size) | 259 | eina_chained_mempool_malloc(void *data, EINA_UNUSED unsigned int size) |
260 | { | 260 | { |
261 | Chained_Mempool *pool = data; | 261 | Chained_Mempool *pool = data; |
262 | Chained_Pool *p = NULL; | 262 | Chained_Pool *p = NULL; |
@@ -434,16 +434,16 @@ eina_chained_mempool_repack(void *data, | |||
434 | } | 434 | } |
435 | 435 | ||
436 | static void * | 436 | static void * |
437 | eina_chained_mempool_realloc(__UNUSED__ void *data, | 437 | eina_chained_mempool_realloc(EINA_UNUSED void *data, |
438 | __UNUSED__ void *element, | 438 | EINA_UNUSED void *element, |
439 | __UNUSED__ unsigned int size) | 439 | EINA_UNUSED unsigned int size) |
440 | { | 440 | { |
441 | return NULL; | 441 | return NULL; |
442 | } | 442 | } |
443 | 443 | ||
444 | static void * | 444 | static void * |
445 | eina_chained_mempool_init(const char *context, | 445 | eina_chained_mempool_init(const char *context, |
446 | __UNUSED__ const char *option, | 446 | EINA_UNUSED const char *option, |
447 | va_list args) | 447 | va_list args) |
448 | { | 448 | { |
449 | Chained_Mempool *mp; | 449 | Chained_Mempool *mp; |
diff --git a/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c b/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c index 0d02f80bbb..9b2deb6e89 100644 --- a/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c +++ b/src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c | |||
@@ -39,7 +39,7 @@ struct _Eina_Ememoa_Fixed_Mempool | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | static void * | 41 | static void * |
42 | eina_ememoa_fixed_malloc(void *data, __UNUSED__ unsigned int size) | 42 | eina_ememoa_fixed_malloc(void *data, EINA_UNUSED unsigned int size) |
43 | { | 43 | { |
44 | Eina_Ememoa_Fixed_Mempool *efm = data; | 44 | Eina_Ememoa_Fixed_Mempool *efm = data; |
45 | 45 | ||
@@ -55,9 +55,9 @@ eina_ememoa_fixed_free(void *data, void *ptr) | |||
55 | } | 55 | } |
56 | 56 | ||
57 | static void * | 57 | static void * |
58 | eina_ememoa_fixed_realloc(__UNUSED__ void *data, | 58 | eina_ememoa_fixed_realloc(EINA_UNUSED void *data, |
59 | __UNUSED__ void *element, | 59 | EINA_UNUSED void *element, |
60 | __UNUSED__ unsigned int size) | 60 | EINA_UNUSED unsigned int size) |
61 | { | 61 | { |
62 | return NULL; | 62 | return NULL; |
63 | } | 63 | } |
@@ -81,7 +81,7 @@ eina_ememoa_fixed_statistics(void *data) | |||
81 | 81 | ||
82 | static void * | 82 | static void * |
83 | eina_ememoa_fixed_init(const char *context, | 83 | eina_ememoa_fixed_init(const char *context, |
84 | __UNUSED__ const char *option, | 84 | EINA_UNUSED const char *option, |
85 | va_list args) | 85 | va_list args) |
86 | { | 86 | { |
87 | struct ememoa_mempool_desc_s *desc = NULL; | 87 | struct ememoa_mempool_desc_s *desc = NULL; |
diff --git a/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c b/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c index 56b99f66c9..736bcc1939 100644 --- a/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c +++ b/src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c | |||
@@ -80,7 +80,7 @@ eina_ememoa_unknown_size_statistics(void *data) | |||
80 | 80 | ||
81 | static void * | 81 | static void * |
82 | eina_ememoa_unknown_size_init(const char *context, | 82 | eina_ememoa_unknown_size_init(const char *context, |
83 | __UNUSED__ const char *option, | 83 | EINA_UNUSED const char *option, |
84 | va_list args) | 84 | va_list args) |
85 | { | 85 | { |
86 | struct ememoa_mempool_desc_s *desc = NULL; | 86 | struct ememoa_mempool_desc_s *desc = NULL; |
diff --git a/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c b/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c index e053e15790..1fd55348db 100644 --- a/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c +++ b/src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c | |||
@@ -70,7 +70,7 @@ _eina_rbtree_inlist_delta(void) | |||
70 | static Eina_Rbtree_Direction | 70 | static Eina_Rbtree_Direction |
71 | _eina_fixed_cmp(const Eina_Rbtree *left, | 71 | _eina_fixed_cmp(const Eina_Rbtree *left, |
72 | const Eina_Rbtree *right, | 72 | const Eina_Rbtree *right, |
73 | __UNUSED__ void *data) | 73 | EINA_UNUSED void *data) |
74 | { | 74 | { |
75 | if (left - right < 0) | 75 | if (left - right < 0) |
76 | return EINA_RBTREE_LEFT; | 76 | return EINA_RBTREE_LEFT; |
@@ -81,7 +81,7 @@ _eina_fixed_cmp(const Eina_Rbtree *left, | |||
81 | static int | 81 | static int |
82 | _eina_fixed_cmp_key(const Eina_Rbtree *node, | 82 | _eina_fixed_cmp_key(const Eina_Rbtree *node, |
83 | const void *key, | 83 | const void *key, |
84 | __UNUSED__ int length, | 84 | EINA_UNUSED int length, |
85 | Eina_Fixed_Bitmap *mp) | 85 | Eina_Fixed_Bitmap *mp) |
86 | { | 86 | { |
87 | const void *a = node; | 87 | const void *a = node; |
@@ -103,13 +103,13 @@ _eina_fixed_cmp_key(const Eina_Rbtree *node, | |||
103 | 103 | ||
104 | static void | 104 | static void |
105 | _eina_fixed_bitmap_pool_free(Eina_Fixed_Bitmap_Pool *pool, | 105 | _eina_fixed_bitmap_pool_free(Eina_Fixed_Bitmap_Pool *pool, |
106 | __UNUSED__ void *data) | 106 | EINA_UNUSED void *data) |
107 | { | 107 | { |
108 | free(pool); | 108 | free(pool); |
109 | } | 109 | } |
110 | 110 | ||
111 | static void * | 111 | static void * |
112 | eina_fixed_bitmap_malloc(void *data, __UNUSED__ unsigned int size) | 112 | eina_fixed_bitmap_malloc(void *data, EINA_UNUSED unsigned int size) |
113 | { | 113 | { |
114 | Eina_Fixed_Bitmap *mp = data; | 114 | Eina_Fixed_Bitmap *mp = data; |
115 | Eina_Fixed_Bitmap_Pool *pool = NULL; | 115 | Eina_Fixed_Bitmap_Pool *pool = NULL; |
@@ -200,16 +200,16 @@ eina_fixed_bitmap_free(void *data, void *ptr) | |||
200 | } | 200 | } |
201 | 201 | ||
202 | static void * | 202 | static void * |
203 | eina_fixed_bitmap_realloc(__UNUSED__ void *data, | 203 | eina_fixed_bitmap_realloc(EINA_UNUSED void *data, |
204 | __UNUSED__ void *element, | 204 | EINA_UNUSED void *element, |
205 | __UNUSED__ unsigned int size) | 205 | EINA_UNUSED unsigned int size) |
206 | { | 206 | { |
207 | return NULL; | 207 | return NULL; |
208 | } | 208 | } |
209 | 209 | ||
210 | static void * | 210 | static void * |
211 | eina_fixed_bitmap_init(__UNUSED__ const char *context, | 211 | eina_fixed_bitmap_init(EINA_UNUSED const char *context, |
212 | __UNUSED__ const char *option, | 212 | EINA_UNUSED const char *option, |
213 | va_list args) | 213 | va_list args) |
214 | { | 214 | { |
215 | Eina_Fixed_Bitmap *mp; | 215 | Eina_Fixed_Bitmap *mp; |
diff --git a/src/modules/eina/mp/one_big/eina_one_big.c b/src/modules/eina/mp/one_big/eina_one_big.c index 1159378dee..c23c47837c 100644 --- a/src/modules/eina/mp/one_big/eina_one_big.c +++ b/src/modules/eina/mp/one_big/eina_one_big.c | |||
@@ -83,7 +83,7 @@ struct _One_Big | |||
83 | }; | 83 | }; |
84 | 84 | ||
85 | static void * | 85 | static void * |
86 | eina_one_big_malloc(void *data, __UNUSED__ unsigned int size) | 86 | eina_one_big_malloc(void *data, EINA_UNUSED unsigned int size) |
87 | { | 87 | { |
88 | One_Big *pool = data; | 88 | One_Big *pool = data; |
89 | unsigned char *mem = NULL; | 89 | unsigned char *mem = NULL; |
@@ -198,16 +198,16 @@ eina_one_big_free(void *data, void *ptr) | |||
198 | } | 198 | } |
199 | 199 | ||
200 | static void * | 200 | static void * |
201 | eina_one_big_realloc(__UNUSED__ void *data, | 201 | eina_one_big_realloc(EINA_UNUSED void *data, |
202 | __UNUSED__ void *element, | 202 | EINA_UNUSED void *element, |
203 | __UNUSED__ unsigned int size) | 203 | EINA_UNUSED unsigned int size) |
204 | { | 204 | { |
205 | return NULL; | 205 | return NULL; |
206 | } | 206 | } |
207 | 207 | ||
208 | static void * | 208 | static void * |
209 | eina_one_big_init(const char *context, | 209 | eina_one_big_init(const char *context, |
210 | __UNUSED__ const char *option, | 210 | EINA_UNUSED const char *option, |
211 | va_list args) | 211 | va_list args) |
212 | { | 212 | { |
213 | One_Big *pool; | 213 | One_Big *pool; |
diff --git a/src/modules/eina/mp/pass_through/eina_pass_through.c b/src/modules/eina/mp/pass_through/eina_pass_through.c index 196868ecba..9aa1f22842 100644 --- a/src/modules/eina/mp/pass_through/eina_pass_through.c +++ b/src/modules/eina/mp/pass_through/eina_pass_through.c | |||
@@ -28,33 +28,33 @@ | |||
28 | #include "eina_private.h" | 28 | #include "eina_private.h" |
29 | 29 | ||
30 | static void * | 30 | static void * |
31 | eina_pass_through_malloc(__UNUSED__ void *data, unsigned int size) | 31 | eina_pass_through_malloc(EINA_UNUSED void *data, unsigned int size) |
32 | { | 32 | { |
33 | return malloc(size); | 33 | return malloc(size); |
34 | } | 34 | } |
35 | 35 | ||
36 | static void | 36 | static void |
37 | eina_pass_through_free(__UNUSED__ void *data, void *ptr) | 37 | eina_pass_through_free(EINA_UNUSED void *data, void *ptr) |
38 | { | 38 | { |
39 | free(ptr); | 39 | free(ptr); |
40 | } | 40 | } |
41 | 41 | ||
42 | static void * | 42 | static void * |
43 | eina_pass_through_realloc(__UNUSED__ void *data, void *ptr, unsigned int size) | 43 | eina_pass_through_realloc(EINA_UNUSED void *data, void *ptr, unsigned int size) |
44 | { | 44 | { |
45 | return realloc(ptr, size); | 45 | return realloc(ptr, size); |
46 | } | 46 | } |
47 | 47 | ||
48 | static void * | 48 | static void * |
49 | eina_pass_through_init(__UNUSED__ const char *context, | 49 | eina_pass_through_init(EINA_UNUSED const char *context, |
50 | __UNUSED__ const char *option, | 50 | EINA_UNUSED const char *option, |
51 | __UNUSED__ va_list args) | 51 | EINA_UNUSED va_list args) |
52 | { | 52 | { |
53 | return (void *)0x1; | 53 | return (void *)0x1; |
54 | } | 54 | } |
55 | 55 | ||
56 | static void | 56 | static void |
57 | eina_pass_through_shutdown(__UNUSED__ void *data) | 57 | eina_pass_through_shutdown(EINA_UNUSED void *data) |
58 | { | 58 | { |
59 | } | 59 | } |
60 | 60 | ||
diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c index 5e14984f8c..b00882b9d2 100644 --- a/src/tests/eet/eet_suite.c +++ b/src/tests/eet/eet_suite.c | |||
@@ -679,7 +679,7 @@ _eet_test_ex_check(Eet_Test_Ex_Type *stuff, | |||
679 | } /* _eet_test_ex_check */ | 679 | } /* _eet_test_ex_check */ |
680 | 680 | ||
681 | static Eina_Bool | 681 | static Eina_Bool |
682 | func(__UNUSED__ const Eina_Hash *hash, | 682 | func(EINA_UNUSED const Eina_Hash *hash, |
683 | const void *key, | 683 | const void *key, |
684 | void *data, | 684 | void *data, |
685 | void *fdata) | 685 | void *fdata) |
@@ -697,8 +697,8 @@ func(__UNUSED__ const Eina_Hash *hash, | |||
697 | } /* func */ | 697 | } /* func */ |
698 | 698 | ||
699 | static Eina_Bool | 699 | static Eina_Bool |
700 | func7(__UNUSED__ const Eina_Hash *hash, | 700 | func7(EINA_UNUSED const Eina_Hash *hash, |
701 | __UNUSED__ const void *key, | 701 | EINA_UNUSED const void *key, |
702 | void *data, | 702 | void *data, |
703 | void *fdata) | 703 | void *fdata) |
704 | { | 704 | { |
@@ -1743,8 +1743,8 @@ END_TEST | |||
1743 | static int | 1743 | static int |
1744 | pass_get(char *pass, | 1744 | pass_get(char *pass, |
1745 | int size, | 1745 | int size, |
1746 | __UNUSED__ int rwflags, | 1746 | EINA_UNUSED int rwflags, |
1747 | __UNUSED__ void *u) | 1747 | EINA_UNUSED void *u) |
1748 | { | 1748 | { |
1749 | memset(pass, 0, size); | 1749 | memset(pass, 0, size); |
1750 | 1750 | ||
@@ -1758,8 +1758,8 @@ pass_get(char *pass, | |||
1758 | static int | 1758 | static int |
1759 | badpass_get(char *pass, | 1759 | badpass_get(char *pass, |
1760 | int size, | 1760 | int size, |
1761 | __UNUSED__ int rwflags, | 1761 | EINA_UNUSED int rwflags, |
1762 | __UNUSED__ void *u) | 1762 | EINA_UNUSED void *u) |
1763 | { | 1763 | { |
1764 | memset(pass, 0, size); | 1764 | memset(pass, 0, size); |
1765 | 1765 | ||
diff --git a/src/tests/eina/eina_test_accessor.c b/src/tests/eina/eina_test_accessor.c index 3c85ef037c..a995429139 100644 --- a/src/tests/eina/eina_test_accessor.c +++ b/src/tests/eina/eina_test_accessor.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "Eina.h" | 26 | #include "Eina.h" |
27 | 27 | ||
28 | static Eina_Bool | 28 | static Eina_Bool |
29 | eina_accessor_check(__UNUSED__ const Eina_Array *array, | 29 | eina_accessor_check(EINA_UNUSED const Eina_Array *array, |
30 | int *data, int *fdata) | 30 | int *data, int *fdata) |
31 | { | 31 | { |
32 | fail_if(*fdata > *data); | 32 | fail_if(*fdata > *data); |
@@ -97,7 +97,7 @@ _eina_test_inlist_build(int i) | |||
97 | } | 97 | } |
98 | 98 | ||
99 | static Eina_Bool | 99 | static Eina_Bool |
100 | eina_accessor_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list, | 100 | eina_accessor_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list, |
101 | Eina_Test_Inlist *data, | 101 | Eina_Test_Inlist *data, |
102 | int *fdata) | 102 | int *fdata) |
103 | { | 103 | { |
@@ -167,7 +167,7 @@ START_TEST(eina_accessor_inlist_simple) | |||
167 | END_TEST | 167 | END_TEST |
168 | 168 | ||
169 | static Eina_Bool | 169 | static Eina_Bool |
170 | eina_iterator_list_data_check(__UNUSED__ const Eina_List *list, | 170 | eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list, |
171 | int *data, | 171 | int *data, |
172 | int *fdata) | 172 | int *fdata) |