diff options
Diffstat (limited to 'source/blender/blenlib/BLI_memiter.h')
-rw-r--r-- | source/blender/blenlib/BLI_memiter.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h index c7a715309e1..abb1bec809d 100644 --- a/source/blender/blenlib/BLI_memiter.h +++ b/source/blender/blenlib/BLI_memiter.h @@ -36,15 +36,14 @@ struct BLI_memiter; typedef struct BLI_memiter BLI_memiter; /* warning, ATTR_MALLOC flag on BLI_memiter_alloc causes crash, see: D2756 */ -BLI_memiter *BLI_memiter_create(unsigned int chunk_size) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; -void *BLI_memiter_alloc(BLI_memiter *mi, - unsigned int size) ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT - ATTR_NONNULL(1); +BLI_memiter *BLI_memiter_create(unsigned int chunk_size) + ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL; +void *BLI_memiter_alloc(BLI_memiter *mi, unsigned int size) + ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL ATTR_NONNULL(1); void BLI_memiter_alloc_from(BLI_memiter *mi, uint elem_size, const void *data_from) ATTR_NONNULL(1, 3); -void *BLI_memiter_calloc(BLI_memiter *mi, - unsigned int size) ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT - ATTR_NONNULL(1); +void *BLI_memiter_calloc(BLI_memiter *mi, unsigned int size) + ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL ATTR_NONNULL(1); void BLI_memiter_destroy(BLI_memiter *mi) ATTR_NONNULL(1); void BLI_memiter_clear(BLI_memiter *mi) ATTR_NONNULL(1); unsigned int BLI_memiter_count(const BLI_memiter *mi) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); @@ -59,11 +58,11 @@ typedef struct BLI_memiter_handle { uint elem_left; } BLI_memiter_handle; -void BLI_memiter_iter_init(BLI_memiter *mi, BLI_memiter_handle *iter) ATTR_NONNULL(); -bool BLI_memiter_iter_done(const BLI_memiter_handle *iter) ATTR_NONNULL(); -void *BLI_memiter_iter_step(BLI_memiter_handle *iter) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +void BLI_memiter_iter_init(BLI_memiter *mi, BLI_memiter_handle *iter) ATTR_NONNULL(1, 2); +bool BLI_memiter_iter_done(const BLI_memiter_handle *iter) ATTR_NONNULL(1); +void *BLI_memiter_iter_step(BLI_memiter_handle *iter) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); void *BLI_memiter_iter_step_size(BLI_memiter_handle *iter, uint *r_size) ATTR_WARN_UNUSED_RESULT - ATTR_NONNULL(); + ATTR_NONNULL(1, 2); #ifdef __cplusplus } |