diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/eina/src/include/eina_array.h | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/eina/src/include/eina_array.h')
-rw-r--r-- | libraries/eina/src/include/eina_array.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libraries/eina/src/include/eina_array.h b/libraries/eina/src/include/eina_array.h index d33f5e9..53183b4 100644 --- a/libraries/eina/src/include/eina_array.h +++ b/libraries/eina/src/include/eina_array.h | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | /** | 33 | /** |
34 | * @page array_01_example_page Basic array usage | 34 | * @page eina_array_01_example_page Basic array usage |
35 | * @dontinclude eina_array_01.c | 35 | * @dontinclude eina_array_01.c |
36 | * | 36 | * |
37 | * For this example we add stdlib.h, stdio.h and string.h for some | 37 | * For this example we add stdlib.h, stdio.h and string.h for some |
@@ -94,7 +94,7 @@ | |||
94 | */ | 94 | */ |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * @page array_02_example_page Removing array elements | 97 | * @page eina_array_02_example_page Removing array elements |
98 | * @dontinclude eina_array_02.c | 98 | * @dontinclude eina_array_02.c |
99 | * | 99 | * |
100 | * Just the usual includes: | 100 | * Just the usual includes: |
@@ -169,7 +169,7 @@ | |||
169 | * element, use eina_array_push() and to remove the last element, use | 169 | * element, use eina_array_push() and to remove the last element, use |
170 | * eina_array_pop(). To retrieve the element at a given position, use | 170 | * eina_array_pop(). To retrieve the element at a given position, use |
171 | * eina_array_data_get(). The number of elements can be retrieved with | 171 | * eina_array_data_get(). The number of elements can be retrieved with |
172 | * eina_array_count_get(). | 172 | * eina_array_count(). |
173 | * | 173 | * |
174 | * Eina_Array is different from a conventional C array in a number of ways, most | 174 | * Eina_Array is different from a conventional C array in a number of ways, most |
175 | * importantly they grow and shrink dynamically, this means that if you add an | 175 | * importantly they grow and shrink dynamically, this means that if you add an |
@@ -191,8 +191,8 @@ | |||
191 | * of void pointers. | 191 | * of void pointers. |
192 | * | 192 | * |
193 | * See here some examples: | 193 | * See here some examples: |
194 | * @li @ref array_01_example_page | 194 | * @li @ref eina_array_01_example_page |
195 | * @li @ref array_02_example_page | 195 | * @li @ref eina_array_02_example_page |
196 | */ | 196 | */ |
197 | 197 | ||
198 | /** | 198 | /** |
@@ -351,7 +351,8 @@ static inline void *eina_array_data_get(const Eina_Array *array, | |||
351 | static inline void eina_array_data_set(const Eina_Array *array, | 351 | static inline void eina_array_data_set(const Eina_Array *array, |
352 | unsigned int idx, | 352 | unsigned int idx, |
353 | const void *data) EINA_ARG_NONNULL(1); | 353 | const void *data) EINA_ARG_NONNULL(1); |
354 | static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1); | 354 | static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT EINA_DEPRECATED; |
355 | static inline unsigned int eina_array_count(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; | ||
355 | 356 | ||
356 | /** | 357 | /** |
357 | * @brief Returned a new iterator associated to an array. | 358 | * @brief Returned a new iterator associated to an array. |
@@ -394,7 +395,7 @@ EAPI Eina_Accessor *eina_array_accessor_new(const Eina_Array *array) EINA | |||
394 | */ | 395 | */ |
395 | static inline Eina_Bool eina_array_foreach(Eina_Array *array, | 396 | static inline Eina_Bool eina_array_foreach(Eina_Array *array, |
396 | Eina_Each_Cb cb, | 397 | Eina_Each_Cb cb, |
397 | void *data); | 398 | void *fdata); |
398 | /** | 399 | /** |
399 | * @def EINA_ARRAY_ITER_NEXT | 400 | * @def EINA_ARRAY_ITER_NEXT |
400 | * @brief Macro to iterate over an array easily. | 401 | * @brief Macro to iterate over an array easily. |
@@ -429,7 +430,7 @@ static inline Eina_Bool eina_array_foreach(Eina_Array *array, | |||
429 | */ | 430 | */ |
430 | #define EINA_ARRAY_ITER_NEXT(array, index, item, iterator) \ | 431 | #define EINA_ARRAY_ITER_NEXT(array, index, item, iterator) \ |
431 | for (index = 0, iterator = (array)->data; \ | 432 | for (index = 0, iterator = (array)->data; \ |
432 | (index < eina_array_count_get(array)) && ((item = *((iterator)++))); \ | 433 | (index < eina_array_count(array)) && ((item = *((iterator)++))); \ |
433 | ++(index)) | 434 | ++(index)) |
434 | 435 | ||
435 | #include "eina_inline_array.x" | 436 | #include "eina_inline_array.x" |