From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- source/blender/blenlib/intern/array_store_utils.c | 99 +++++++++++------------ 1 file changed, 48 insertions(+), 51 deletions(-) (limited to 'source/blender/blenlib/intern/array_store_utils.c') diff --git a/source/blender/blenlib/intern/array_store_utils.c b/source/blender/blenlib/intern/array_store_utils.c index d1b936b76f7..64c985a4c63 100644 --- a/source/blender/blenlib/intern/array_store_utils.c +++ b/source/blender/blenlib/intern/array_store_utils.c @@ -24,72 +24,69 @@ #include "BLI_utildefines.h" #include "BLI_array_store.h" -#include "BLI_array_store_utils.h" /* own include */ +#include "BLI_array_store_utils.h" /* own include */ #include "BLI_math_base.h" -BArrayStore *BLI_array_store_at_size_ensure( - struct BArrayStore_AtSize *bs_stride, - const int stride, const int chunk_size) +BArrayStore *BLI_array_store_at_size_ensure(struct BArrayStore_AtSize *bs_stride, + const int stride, + const int chunk_size) { - if (bs_stride->stride_table_len < stride) { - bs_stride->stride_table_len = stride; - bs_stride->stride_table = MEM_recallocN(bs_stride->stride_table, sizeof(*bs_stride->stride_table) * stride); - } - BArrayStore **bs_p = &bs_stride->stride_table[stride - 1]; + if (bs_stride->stride_table_len < stride) { + bs_stride->stride_table_len = stride; + bs_stride->stride_table = MEM_recallocN(bs_stride->stride_table, + sizeof(*bs_stride->stride_table) * stride); + } + BArrayStore **bs_p = &bs_stride->stride_table[stride - 1]; - if ((*bs_p) == NULL) { - /* calculate best chunk-count to fit a power of two */ - unsigned int chunk_count = chunk_size; - { - unsigned int size = chunk_count * stride; - size = power_of_2_max_u(size); - size = MEM_SIZE_OPTIMAL(size); - chunk_count = size / stride; - } + if ((*bs_p) == NULL) { + /* calculate best chunk-count to fit a power of two */ + unsigned int chunk_count = chunk_size; + { + unsigned int size = chunk_count * stride; + size = power_of_2_max_u(size); + size = MEM_SIZE_OPTIMAL(size); + chunk_count = size / stride; + } - (*bs_p) = BLI_array_store_create(stride, chunk_count); - } - return *bs_p; + (*bs_p) = BLI_array_store_create(stride, chunk_count); + } + return *bs_p; } -BArrayStore *BLI_array_store_at_size_get( - struct BArrayStore_AtSize *bs_stride, - const int stride) +BArrayStore *BLI_array_store_at_size_get(struct BArrayStore_AtSize *bs_stride, const int stride) { - BLI_assert(stride > 0 && stride <= bs_stride->stride_table_len); - return bs_stride->stride_table[stride - 1]; + BLI_assert(stride > 0 && stride <= bs_stride->stride_table_len); + return bs_stride->stride_table[stride - 1]; } -void BLI_array_store_at_size_clear( - struct BArrayStore_AtSize *bs_stride) +void BLI_array_store_at_size_clear(struct BArrayStore_AtSize *bs_stride) { - for (int i = 0; i < bs_stride->stride_table_len; i += 1) { - if (bs_stride->stride_table[i]) { - BLI_array_store_destroy(bs_stride->stride_table[i]); - } - } + for (int i = 0; i < bs_stride->stride_table_len; i += 1) { + if (bs_stride->stride_table[i]) { + BLI_array_store_destroy(bs_stride->stride_table[i]); + } + } - MEM_freeN(bs_stride->stride_table); - bs_stride->stride_table = NULL; - bs_stride->stride_table_len = 0; + MEM_freeN(bs_stride->stride_table); + bs_stride->stride_table = NULL; + bs_stride->stride_table_len = 0; } - -void BLI_array_store_at_size_calc_memory_usage( - struct BArrayStore_AtSize *bs_stride, - size_t *r_size_expanded, size_t *r_size_compacted) +void BLI_array_store_at_size_calc_memory_usage(struct BArrayStore_AtSize *bs_stride, + size_t *r_size_expanded, + size_t *r_size_compacted) { - size_t size_compacted = 0; - size_t size_expanded = 0; - for (int i = 0; i < bs_stride->stride_table_len; i++) { - BArrayStore *bs = bs_stride->stride_table[i]; - if (bs) { - size_compacted += BLI_array_store_calc_size_compacted_get(bs); - size_expanded += BLI_array_store_calc_size_expanded_get(bs); - } - } + size_t size_compacted = 0; + size_t size_expanded = 0; + for (int i = 0; i < bs_stride->stride_table_len; i++) { + BArrayStore *bs = bs_stride->stride_table[i]; + if (bs) { + size_compacted += BLI_array_store_calc_size_compacted_get(bs); + size_expanded += BLI_array_store_calc_size_expanded_get(bs); + } + } - *r_size_expanded = size_expanded; - *r_size_compacted = size_compacted; + *r_size_expanded = size_expanded; + *r_size_compacted = size_compacted; } -- cgit v1.2.3