summaryrefslogtreecommitdiff
path: root/src/benchmarks
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/benchmarks
parent227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff)
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
Diffstat (limited to 'src/benchmarks')
-rw-r--r--src/benchmarks/eina/eina_bench_array.c12
-rw-r--r--src/benchmarks/eina/eina_bench_hash.c10
-rw-r--r--src/benchmarks/eina/evas_mempool.c2
3 files changed, 12 insertions, 12 deletions
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
50static Eina_Bool keep(void *data, __UNUSED__ void *gdata) 50static 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
111static Eina_Bool 111static Eina_Bool
112eina_iterator_ebo_free(__UNUSED__ const Eina_Array *array, 112eina_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
119static Eina_Bool 119static Eina_Bool
120eina_iterator_ebo_rand(__UNUSED__ const void *container, 120eina_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
611static void 611static 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
54static int 54static 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
71static Eina_Rbtree_Direction 71static 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
95static void 95static 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
58void * 58void *
59evas_mempool_malloc(Evas_Mempool *pool, int size __UNUSED__) 59evas_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);