diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
| commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
| tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenlib/BLI_memiter.h | |
| parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) | |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenlib/BLI_memiter.h')
| -rw-r--r-- | source/blender/blenlib/BLI_memiter.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/source/blender/blenlib/BLI_memiter.h b/source/blender/blenlib/BLI_memiter.h index da73eeb1167..6f6316e15e4 100644 --- a/source/blender/blenlib/BLI_memiter.h +++ b/source/blender/blenlib/BLI_memiter.h @@ -22,8 +22,7 @@ */ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #include "BLI_sys_types.h" @@ -40,11 +39,16 @@ 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); -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_destroy(BLI_memiter *mi) ATTR_NONNULL(1); -void BLI_memiter_clear(BLI_memiter *mi) ATTR_NONNULL(1); +void *BLI_memiter_alloc(BLI_memiter *mi, + unsigned int size) ATTR_RETURNS_NONNULL ATTR_WARN_UNUSED_RESULT + 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_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); /* utils */ @@ -53,17 +57,18 @@ void *BLI_memiter_elem_first_size(BLI_memiter *mi, unsigned int *r_size); /* private structure */ typedef struct BLI_memiter_handle { - struct BLI_memiter_elem *elem; - uint elem_left; + struct BLI_memiter_elem *elem; + 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_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_step_size(BLI_memiter_handle *iter, uint *r_size) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +void *BLI_memiter_iter_step_size(BLI_memiter_handle *iter, uint *r_size) ATTR_WARN_UNUSED_RESULT + ATTR_NONNULL(); #ifdef __cplusplus } #endif -#endif /* __BLI_MEMITER_H__ */ +#endif /* __BLI_MEMITER_H__ */ |