summaryrefslogtreecommitdiff
path: root/src/modules/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/modules/eina
parent227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff)
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
Diffstat (limited to 'src/modules/eina')
-rw-r--r--src/modules/eina/mp/buddy/eina_buddy.c4
-rw-r--r--src/modules/eina/mp/chained_pool/eina_chained_mempool.c14
-rw-r--r--src/modules/eina/mp/ememoa_fixed/eina_ememoa_fixed.c10
-rw-r--r--src/modules/eina/mp/ememoa_unknown/eina_ememoa_unknown.c2
-rw-r--r--src/modules/eina/mp/fixed_bitmap/eina_fixed_bitmap.c18
-rw-r--r--src/modules/eina/mp/one_big/eina_one_big.c10
-rw-r--r--src/modules/eina/mp/pass_through/eina_pass_through.c14
7 files changed, 36 insertions, 36 deletions
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
83static void *_init(__UNUSED__ const char *context, 83static 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
102static inline Eina_Rbtree_Direction 102static 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
109static inline int 109static 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
258static void * 258static void *
259eina_chained_mempool_malloc(void *data, __UNUSED__ unsigned int size) 259eina_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
436static void * 436static void *
437eina_chained_mempool_realloc(__UNUSED__ void *data, 437eina_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
444static void * 444static void *
445eina_chained_mempool_init(const char *context, 445eina_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
41static void * 41static void *
42eina_ememoa_fixed_malloc(void *data, __UNUSED__ unsigned int size) 42eina_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
57static void * 57static void *
58eina_ememoa_fixed_realloc(__UNUSED__ void *data, 58eina_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
82static void * 82static void *
83eina_ememoa_fixed_init(const char *context, 83eina_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
81static void * 81static void *
82eina_ememoa_unknown_size_init(const char *context, 82eina_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)
70static Eina_Rbtree_Direction 70static 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,
81static int 81static 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
104static void 104static 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
111static void * 111static void *
112eina_fixed_bitmap_malloc(void *data, __UNUSED__ unsigned int size) 112eina_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
202static void * 202static void *
203eina_fixed_bitmap_realloc(__UNUSED__ void *data, 203eina_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
210static void * 210static void *
211eina_fixed_bitmap_init(__UNUSED__ const char *context, 211eina_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
85static void * 85static void *
86eina_one_big_malloc(void *data, __UNUSED__ unsigned int size) 86eina_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
200static void * 200static void *
201eina_one_big_realloc(__UNUSED__ void *data, 201eina_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
208static void * 208static void *
209eina_one_big_init(const char *context, 209eina_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
30static void * 30static void *
31eina_pass_through_malloc(__UNUSED__ void *data, unsigned int size) 31eina_pass_through_malloc(EINA_UNUSED void *data, unsigned int size)
32{ 32{
33 return malloc(size); 33 return malloc(size);
34} 34}
35 35
36static void 36static void
37eina_pass_through_free(__UNUSED__ void *data, void *ptr) 37eina_pass_through_free(EINA_UNUSED void *data, void *ptr)
38{ 38{
39 free(ptr); 39 free(ptr);
40} 40}
41 41
42static void * 42static void *
43eina_pass_through_realloc(__UNUSED__ void *data, void *ptr, unsigned int size) 43eina_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
48static void * 48static void *
49eina_pass_through_init(__UNUSED__ const char *context, 49eina_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
56static void 56static void
57eina_pass_through_shutdown(__UNUSED__ void *data) 57eina_pass_through_shutdown(EINA_UNUSED void *data)
58{ 58{
59} 59}
60 60