summaryrefslogtreecommitdiff
path: root/src/tests/eina
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
commit7fe3d3599446108bc36a0ab6ec563a267db02733 (patch)
tree8c45e7b3087e289466d4fb4ff99b12b209b770f6 /src/tests/eina
parent227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff)
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
Diffstat (limited to 'src/tests/eina')
-rw-r--r--src/tests/eina/eina_test_accessor.c6
-rw-r--r--src/tests/eina/eina_test_counter.c2
-rw-r--r--src/tests/eina/eina_test_error.c2
-rw-r--r--src/tests/eina/eina_test_file.c2
-rw-r--r--src/tests/eina/eina_test_hash.c4
-rw-r--r--src/tests/eina/eina_test_inarray.c4
-rw-r--r--src/tests/eina/eina_test_inlist.c2
-rw-r--r--src/tests/eina/eina_test_iterator.c20
-rw-r--r--src/tests/eina/eina_test_log.c6
-rw-r--r--src/tests/eina/eina_test_magic.c4
-rw-r--r--src/tests/eina/eina_test_matrixsparse.c8
-rw-r--r--src/tests/eina/eina_test_module.c2
-rw-r--r--src/tests/eina/eina_test_rbtree.c6
-rw-r--r--src/tests/eina/eina_test_sched.c2
-rw-r--r--src/tests/eina/eina_test_ustr.c2
15 files changed, 36 insertions, 36 deletions
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
28static Eina_Bool 28static Eina_Bool
29eina_accessor_check(__UNUSED__ const Eina_Array *array, 29eina_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
99static Eina_Bool 99static Eina_Bool
100eina_accessor_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list, 100eina_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)
167END_TEST 167END_TEST
168 168
169static Eina_Bool 169static Eina_Bool
170eina_iterator_list_data_check(__UNUSED__ const Eina_List *list, 170eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list,
171 int *data, 171 int *data,
172 int *fdata) 172 int *fdata)
173{ 173{
diff --git a/src/tests/eina/eina_test_counter.c b/src/tests/eina/eina_test_counter.c
index 4d956fd353..1a6c77c95e 100644
--- a/src/tests/eina/eina_test_counter.c
+++ b/src/tests/eina/eina_test_counter.c
@@ -38,7 +38,7 @@ struct log_ctx {
38//#define SHOW_LOG 1 38//#define SHOW_LOG 1
39 39
40static void 40static void
41_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 41_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
42{ 42{
43 struct log_ctx *ctx = data; 43 struct log_ctx *ctx = data;
44 va_list cp_args; 44 va_list cp_args;
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index 962f2ded44..2f3d92e2f1 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -43,7 +43,7 @@ struct log_ctx {
43//#define SHOW_LOG 1 43//#define SHOW_LOG 1
44 44
45static void 45static void
46_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 46_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
47{ 47{
48 struct log_ctx *ctx = data; 48 struct log_ctx *ctx = data;
49 va_list cp_args; 49 va_list cp_args;
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index a3ba998693..60b3a3c361 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -39,7 +39,7 @@ struct log_ctx {
39//#define SHOW_LOG 1 39//#define SHOW_LOG 1
40 40
41static void 41static void
42_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 42_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
43{ 43{
44 struct log_ctx *ctx = data; 44 struct log_ctx *ctx = data;
45 va_list cp_args; 45 va_list cp_args;
diff --git a/src/tests/eina/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
index aeeb655e7b..7a1fceaa41 100644
--- a/src/tests/eina/eina_test_hash.c
+++ b/src/tests/eina/eina_test_hash.c
@@ -28,10 +28,10 @@
28#include "Eina.h" 28#include "Eina.h"
29 29
30static Eina_Bool 30static Eina_Bool
31eina_foreach_check(__UNUSED__ const Eina_Hash *hash, 31eina_foreach_check(EINA_UNUSED const Eina_Hash *hash,
32 const void *key, 32 const void *key,
33 void *data, 33 void *data,
34 __UNUSED__ void *fdata) 34 EINA_UNUSED void *fdata)
35{ 35{
36 int *j = data; 36 int *j = data;
37 int i; 37 int i;
diff --git a/src/tests/eina/eina_test_inarray.c b/src/tests/eina/eina_test_inarray.c
index 5f33f4710c..51397707d6 100644
--- a/src/tests/eina/eina_test_inarray.c
+++ b/src/tests/eina/eina_test_inarray.c
@@ -289,7 +289,7 @@ START_TEST(eina_inarray_test_reverse)
289END_TEST 289END_TEST
290 290
291static Eina_Bool 291static Eina_Bool
292array_foreach(const void *array __UNUSED__, void *p, void *user_data __UNUSED__) 292array_foreach(const void *array EINA_UNUSED, void *p, void *user_data EINA_UNUSED)
293{ 293{
294 short *member = p; 294 short *member = p;
295 int *i = user_data; 295 int *i = user_data;
@@ -299,7 +299,7 @@ array_foreach(const void *array __UNUSED__, void *p, void *user_data __UNUSED__)
299} 299}
300 300
301static Eina_Bool 301static Eina_Bool
302array_foreach_stop_2nd(const void *array __UNUSED__, void *p, void *user_data __UNUSED__) 302array_foreach_stop_2nd(const void *array EINA_UNUSED, void *p, void *user_data EINA_UNUSED)
303{ 303{
304 short *member = p; 304 short *member = p;
305 int *i = user_data; 305 int *i = user_data;
diff --git a/src/tests/eina/eina_test_inlist.c b/src/tests/eina/eina_test_inlist.c
index a8631e7080..7d29b37f40 100644
--- a/src/tests/eina/eina_test_inlist.c
+++ b/src/tests/eina/eina_test_inlist.c
@@ -45,7 +45,7 @@ struct log_ctx {
45//#define SHOW_LOG 1 45//#define SHOW_LOG 1
46 46
47static void 47static void
48_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 48_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
49{ 49{
50 struct log_ctx *ctx = data; 50 struct log_ctx *ctx = data;
51 va_list cp_args; 51 va_list cp_args;
diff --git a/src/tests/eina/eina_test_iterator.c b/src/tests/eina/eina_test_iterator.c
index 84bb336933..4c14decc70 100644
--- a/src/tests/eina/eina_test_iterator.c
+++ b/src/tests/eina/eina_test_iterator.c
@@ -26,7 +26,7 @@
26#include "Eina.h" 26#include "Eina.h"
27 27
28static Eina_Bool 28static Eina_Bool
29eina_iterator_array_check(__UNUSED__ const Eina_Array *array, 29eina_iterator_array_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);
@@ -77,7 +77,7 @@ END_TEST
77static Eina_Bool 77static Eina_Bool
78eina_iterator_hash_key_check(const Eina_Hash *hash, 78eina_iterator_hash_key_check(const Eina_Hash *hash,
79 const char *key, 79 const char *key,
80 __UNUSED__ void *fdata) 80 EINA_UNUSED void *fdata)
81{ 81{
82 fail_if(eina_hash_find(hash, key) == NULL); 82 fail_if(eina_hash_find(hash, key) == NULL);
83 83
@@ -86,7 +86,7 @@ eina_iterator_hash_key_check(const Eina_Hash *hash,
86static Eina_Bool 86static Eina_Bool
87eina_iterator_hash_data_check(const Eina_Hash *hash, 87eina_iterator_hash_data_check(const Eina_Hash *hash,
88 int *data, 88 int *data,
89 __UNUSED__ void *fdata) 89 EINA_UNUSED void *fdata)
90{ 90{
91 char tmp[10]; 91 char tmp[10];
92 92
@@ -96,9 +96,9 @@ eina_iterator_hash_data_check(const Eina_Hash *hash,
96 return EINA_TRUE; 96 return EINA_TRUE;
97} 97}
98static Eina_Bool 98static Eina_Bool
99eina_iterator_hash_tuple_check(__UNUSED__ const Eina_Hash *hash, 99eina_iterator_hash_tuple_check(EINA_UNUSED const Eina_Hash *hash,
100 Eina_Hash_Tuple *tuple, 100 Eina_Hash_Tuple *tuple,
101 __UNUSED__ void *fdata) 101 EINA_UNUSED void *fdata)
102{ 102{
103 fail_if(atoi((char *)tuple->key) != *((int *)tuple->data)); 103 fail_if(atoi((char *)tuple->key) != *((int *)tuple->data));
104 104
@@ -160,7 +160,7 @@ _eina_test_inlist_build(int i)
160} 160}
161 161
162static Eina_Bool 162static Eina_Bool
163eina_iterator_inlist_data_check(__UNUSED__ const Eina_Inlist *in_list, 163eina_iterator_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list,
164 Eina_Test_Inlist *data, 164 Eina_Test_Inlist *data,
165 int *fdata) 165 int *fdata)
166{ 166{
@@ -223,7 +223,7 @@ START_TEST(eina_iterator_inlist_simple)
223END_TEST 223END_TEST
224 224
225static Eina_Bool 225static Eina_Bool
226eina_iterator_list_data_check(__UNUSED__ const Eina_List *list, 226eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list,
227 int *data, 227 int *data,
228 int *fdata) 228 int *fdata)
229{ 229{
@@ -320,7 +320,7 @@ _eina_rbtree_int_new(int value)
320} 320}
321 321
322static Eina_Bool 322static Eina_Bool
323eina_iterator_rbtree_data_check_sorted(__UNUSED__ const Eina_List *list, 323eina_iterator_rbtree_data_check_sorted(EINA_UNUSED const Eina_List *list,
324 Eina_Rbtree_Int *data, 324 Eina_Rbtree_Int *data,
325 int *fdata) 325 int *fdata)
326{ 326{
@@ -343,7 +343,7 @@ eina_iterator_rbtree_data_check_sorted(__UNUSED__ const Eina_List *list,
343} 343}
344 344
345static Eina_Bool 345static Eina_Bool
346eina_iterator_rbtree_data_check_prefix(__UNUSED__ const Eina_List *list, 346eina_iterator_rbtree_data_check_prefix(EINA_UNUSED const Eina_List *list,
347 Eina_Rbtree_Int *data, 347 Eina_Rbtree_Int *data,
348 int *fdata) 348 int *fdata)
349{ 349{
@@ -366,7 +366,7 @@ eina_iterator_rbtree_data_check_prefix(__UNUSED__ const Eina_List *list,
366} 366}
367 367
368static Eina_Bool 368static Eina_Bool
369eina_iterator_rbtree_data_check_postfix(__UNUSED__ const Eina_List *list, 369eina_iterator_rbtree_data_check_postfix(EINA_UNUSED const Eina_List *list,
370 Eina_Rbtree_Int *data, 370 Eina_Rbtree_Int *data,
371 int *fdata) 371 int *fdata)
372{ 372{
diff --git a/src/tests/eina/eina_test_log.c b/src/tests/eina/eina_test_log.c
index e0f0363b9a..f922281e66 100644
--- a/src/tests/eina/eina_test_log.c
+++ b/src/tests/eina/eina_test_log.c
@@ -40,7 +40,7 @@ struct log_ctx {
40//#define SHOW_LOG 1 40//#define SHOW_LOG 1
41 41
42static void 42static void
43_eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 43_eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
44{ 44{
45 struct log_ctx *ctx = data; 45 struct log_ctx *ctx = data;
46 ck_assert_int_eq(ctx->level, level); 46 ck_assert_int_eq(ctx->level, level);
@@ -57,7 +57,7 @@ _eina_test_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file,
57} 57}
58 58
59static void 59static void
60_eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 60_eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
61{ 61{
62 struct log_ctx *ctx = data; 62 struct log_ctx *ctx = data;
63 ck_assert_int_eq(ctx->level, level); 63 ck_assert_int_eq(ctx->level, level);
@@ -73,7 +73,7 @@ _eina_test_log_domain(const Eina_Log_Domain *d, Eina_Log_Level level, const char
73} 73}
74 74
75static void 75static void
76_eina_test_log_safety(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 76_eina_test_log_safety(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
77{ 77{
78 struct log_ctx *ctx = data; 78 struct log_ctx *ctx = data;
79 va_list cp_args; 79 va_list cp_args;
diff --git a/src/tests/eina/eina_test_magic.c b/src/tests/eina/eina_test_magic.c
index d0a374e77c..b41ed5d099 100644
--- a/src/tests/eina/eina_test_magic.c
+++ b/src/tests/eina/eina_test_magic.c
@@ -50,7 +50,7 @@ struct log_ctx {
50//#define SHOW_LOG 1 50//#define SHOW_LOG 1
51 51
52static void 52static void
53_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 53_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
54{ 54{
55 struct log_ctx *ctx = data; 55 struct log_ctx *ctx = data;
56 va_list cp_args; 56 va_list cp_args;
@@ -76,7 +76,7 @@ _eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const
76} 76}
77 77
78static void 78static void
79_eina_test_magic_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 79_eina_test_magic_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
80{ 80{
81 struct log_ctx *ctx = data; 81 struct log_ctx *ctx = data;
82 82
diff --git a/src/tests/eina/eina_test_matrixsparse.c b/src/tests/eina/eina_test_matrixsparse.c
index e07b1eead7..1aaf4e62ab 100644
--- a/src/tests/eina/eina_test_matrixsparse.c
+++ b/src/tests/eina/eina_test_matrixsparse.c
@@ -10,8 +10,8 @@
10#define MAX_ROWS 10 10#define MAX_ROWS 10
11#define MAX_COLS 10 11#define MAX_COLS 10
12 12
13static void eina_matrixsparse_free_cell_cb(void *user_data __UNUSED__, 13static void eina_matrixsparse_free_cell_cb(void *user_data EINA_UNUSED,
14 void *cell_data __UNUSED__) 14 void *cell_data EINA_UNUSED)
15{ 15{
16} 16}
17 17
@@ -35,8 +35,8 @@ static void matrixsparse_initialize(Eina_Matrixsparse *matrix,
35 35
36static void matrixsparse_check(Eina_Matrixsparse *matrix, 36static void matrixsparse_check(Eina_Matrixsparse *matrix,
37 long data[MAX_ROWS][MAX_COLS], 37 long data[MAX_ROWS][MAX_COLS],
38 unsigned long nrows __UNUSED__, 38 unsigned long nrows EINA_UNUSED,
39 unsigned long ncols __UNUSED__) 39 unsigned long ncols EINA_UNUSED)
40{ 40{
41 unsigned long i, j; 41 unsigned long i, j;
42 long *test1; 42 long *test1;
diff --git a/src/tests/eina/eina_test_module.c b/src/tests/eina/eina_test_module.c
index 56bdca7bc0..de7fa697ed 100644
--- a/src/tests/eina/eina_test_module.c
+++ b/src/tests/eina/eina_test_module.c
@@ -25,7 +25,7 @@
25#include "eina_suite.h" 25#include "eina_suite.h"
26#include "Eina.h" 26#include "Eina.h"
27 27
28static Eina_Bool list_cb(Eina_Module *m, void *data __UNUSED__) 28static Eina_Bool list_cb(Eina_Module *m, void *data EINA_UNUSED)
29{ 29{
30 int *sym; 30 int *sym;
31 const char *file; 31 const char *file;
diff --git a/src/tests/eina/eina_test_rbtree.c b/src/tests/eina/eina_test_rbtree.c
index fabe2bfd2a..dba904a21f 100644
--- a/src/tests/eina/eina_test_rbtree.c
+++ b/src/tests/eina/eina_test_rbtree.c
@@ -87,7 +87,7 @@ struct _Eina_Rbtree_Int
87static Eina_Rbtree_Direction 87static Eina_Rbtree_Direction
88eina_rbtree_int_cmp(const Eina_Rbtree_Int *left, 88eina_rbtree_int_cmp(const Eina_Rbtree_Int *left,
89 const Eina_Rbtree_Int *right, 89 const Eina_Rbtree_Int *right,
90 __UNUSED__ void *data) 90 EINA_UNUSED void *data)
91{ 91{
92 fail_if(!left); 92 fail_if(!left);
93 fail_if(!right); 93 fail_if(!right);
@@ -101,8 +101,8 @@ eina_rbtree_int_cmp(const Eina_Rbtree_Int *left,
101static int 101static int
102eina_rbtree_int_key(const Eina_Rbtree_Int *node, 102eina_rbtree_int_key(const Eina_Rbtree_Int *node,
103 const int *key, 103 const int *key,
104 __UNUSED__ int length, 104 EINA_UNUSED int length,
105 __UNUSED__ void *data) 105 EINA_UNUSED void *data)
106{ 106{
107 fail_if(!node); 107 fail_if(!node);
108 return node->value - *key; 108 return node->value - *key;
diff --git a/src/tests/eina/eina_test_sched.c b/src/tests/eina/eina_test_sched.c
index ff83a7efcb..53a771dc70 100644
--- a/src/tests/eina/eina_test_sched.c
+++ b/src/tests/eina/eina_test_sched.c
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39static void * 39static void *
40_thread_run(void *arg __UNUSED__) 40_thread_run(void *arg EINA_UNUSED)
41{ 41{
42 int niceval = getpriority(PRIO_PROCESS, 0); 42 int niceval = getpriority(PRIO_PROCESS, 0);
43 int niceval2; 43 int niceval2;
diff --git a/src/tests/eina/eina_test_ustr.c b/src/tests/eina/eina_test_ustr.c
index 75126cc6f9..6240dd6719 100644
--- a/src/tests/eina/eina_test_ustr.c
+++ b/src/tests/eina/eina_test_ustr.c
@@ -39,7 +39,7 @@ struct log_ctx {
39//#define SHOW_LOG 1 39//#define SHOW_LOG 1
40 40
41static void 41static void
42_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args __UNUSED__) 42_eina_test_safety_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args EINA_UNUSED)
43{ 43{
44 struct log_ctx *ctx = data; 44 struct log_ctx *ctx = data;
45 va_list cp_args; 45 va_list cp_args;