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/BLI_listbase.h | 128 +++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 42 deletions(-) (limited to 'source/blender/blenlib/BLI_listbase.h') diff --git a/source/blender/blenlib/BLI_listbase.h b/source/blender/blenlib/BLI_listbase.h index 5e93039c39c..5d7fc5eeee3 100644 --- a/source/blender/blenlib/BLI_listbase.h +++ b/source/blender/blenlib/BLI_listbase.h @@ -34,22 +34,45 @@ extern "C" { #endif -int BLI_findindex(const struct ListBase *listbase, const void *vlink) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -int BLI_findstringindex(const struct ListBase *listbase, const char *id, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +int BLI_findindex(const struct ListBase *listbase, const void *vlink) ATTR_WARN_UNUSED_RESULT + ATTR_NONNULL(1); +int BLI_findstringindex(const struct ListBase *listbase, + const char *id, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); /* find forwards */ -void *BLI_findlink(const struct ListBase *listbase, int number) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_findstring(const struct ListBase *listbase, const char *id, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_findstring_ptr(const struct ListBase *listbase, const char *id, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_findptr(const struct ListBase *listbase, const void *ptr, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_listbase_bytes_find(const ListBase *listbase, const void *bytes, const size_t bytes_size, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2); +void *BLI_findlink(const struct ListBase *listbase, int number) ATTR_WARN_UNUSED_RESULT + ATTR_NONNULL(1); +void *BLI_findstring(const struct ListBase *listbase, + const char *id, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void *BLI_findstring_ptr(const struct ListBase *listbase, + const char *id, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void *BLI_findptr(const struct ListBase *listbase, + const void *ptr, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void *BLI_listbase_bytes_find(const ListBase *listbase, + const void *bytes, + const size_t bytes_size, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2); /* find backwards */ -void *BLI_rfindlink(const struct ListBase *listbase, int number) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_rfindstring(const struct ListBase *listbase, const char *id, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_rfindstring_ptr(const struct ListBase *listbase, const char *id, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_rfindptr(const struct ListBase *listbase, const void *ptr, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void *BLI_listbase_bytes_rfind(const ListBase *listbase, const void *bytes, const size_t bytes_size, const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2); +void *BLI_rfindlink(const struct ListBase *listbase, int number) ATTR_WARN_UNUSED_RESULT + ATTR_NONNULL(1); +void *BLI_rfindstring(const struct ListBase *listbase, + const char *id, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void *BLI_rfindstring_ptr(const struct ListBase *listbase, + const char *id, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void *BLI_rfindptr(const struct ListBase *listbase, + const void *ptr, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +void *BLI_listbase_bytes_rfind(const ListBase *listbase, + const void *bytes, + const size_t bytes_size, + const int offset) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2); void BLI_freelistN(struct ListBase *listbase) ATTR_NONNULL(1); void BLI_addtail(struct ListBase *listbase, void *vlink) ATTR_NONNULL(1); @@ -59,19 +82,29 @@ void *BLI_pophead(ListBase *listbase) ATTR_NONNULL(1); void *BLI_poptail(ListBase *listbase) ATTR_NONNULL(1); void BLI_addhead(struct ListBase *listbase, void *vlink) ATTR_NONNULL(1); -void BLI_insertlinkbefore(struct ListBase *listbase, void *vnextlink, void *vnewlink) ATTR_NONNULL(1); -void BLI_insertlinkafter(struct ListBase *listbase, void *vprevlink, void *vnewlink) ATTR_NONNULL(1); +void BLI_insertlinkbefore(struct ListBase *listbase, void *vnextlink, void *vnewlink) + ATTR_NONNULL(1); +void BLI_insertlinkafter(struct ListBase *listbase, void *vprevlink, void *vnewlink) + ATTR_NONNULL(1); void BLI_insertlinkreplace(ListBase *listbase, void *v_l_src, void *v_l_dst) ATTR_NONNULL(1, 2, 3); -void BLI_listbase_sort(struct ListBase *listbase, int (*cmp)(const void *, const void *)) ATTR_NONNULL(1, 2); -void BLI_listbase_sort_r(ListBase *listbase, int (*cmp)(void *, const void *, const void *), void *thunk) ATTR_NONNULL(1, 2); +void BLI_listbase_sort(struct ListBase *listbase, int (*cmp)(const void *, const void *)) + ATTR_NONNULL(1, 2); +void BLI_listbase_sort_r(ListBase *listbase, + int (*cmp)(void *, const void *, const void *), + void *thunk) ATTR_NONNULL(1, 2); bool BLI_listbase_link_move(ListBase *listbase, void *vlink, int step) ATTR_NONNULL(); void BLI_freelist(struct ListBase *listbase) ATTR_NONNULL(1); -int BLI_listbase_count_at_most(const struct ListBase *listbase, const int count_max) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -int BLI_listbase_count(const struct ListBase *listbase) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +int BLI_listbase_count_at_most(const struct ListBase *listbase, + const int count_max) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); +int BLI_listbase_count(const struct ListBase *listbase) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); void BLI_freelinkN(struct ListBase *listbase, void *vlink) ATTR_NONNULL(1); -void BLI_listbase_swaplinks(struct ListBase *listbase, void *vlinka, void *vlinkb) ATTR_NONNULL(1, 2); -void BLI_listbases_swaplinks(struct ListBase *listbasea, struct ListBase *listbaseb, void *vlinka, void *vlinkb) ATTR_NONNULL(2, 3); +void BLI_listbase_swaplinks(struct ListBase *listbase, void *vlinka, void *vlinkb) + ATTR_NONNULL(1, 2); +void BLI_listbases_swaplinks(struct ListBase *listbasea, + struct ListBase *listbaseb, + void *vlinka, + void *vlinkb) ATTR_NONNULL(2, 3); void BLI_movelisttolist(struct ListBase *dst, struct ListBase *src) ATTR_NONNULL(1, 2); void BLI_movelisttolist_reverse(struct ListBase *dst, struct ListBase *src) ATTR_NONNULL(1, 2); @@ -83,9 +116,18 @@ void BLI_listbase_rotate_last(struct ListBase *lb, void *vlink) ATTR_NONNULL(1, /** * Utility functions to avoid first/last references inline all over. */ -BLI_INLINE bool BLI_listbase_is_single(const struct ListBase *lb) { return (lb->first && lb->first == lb->last); } -BLI_INLINE bool BLI_listbase_is_empty(const struct ListBase *lb) { return (lb->first == (void *)0); } -BLI_INLINE void BLI_listbase_clear(struct ListBase *lb) { lb->first = lb->last = (void *)0; } +BLI_INLINE bool BLI_listbase_is_single(const struct ListBase *lb) +{ + return (lb->first && lb->first == lb->last); +} +BLI_INLINE bool BLI_listbase_is_empty(const struct ListBase *lb) +{ + return (lb->first == (void *)0); +} +BLI_INLINE void BLI_listbase_clear(struct ListBase *lb) +{ + lb->first = lb->last = (void *)0; +} /* create a generic list node containing link to provided data */ struct LinkData *BLI_genericNodeN(void *data); @@ -105,36 +147,38 @@ struct LinkData *BLI_genericNodeN(void *data); * \endcode */ #define LISTBASE_CIRCULAR_FORWARD_BEGIN(lb, lb_iter, lb_init) \ -if ((lb)->first && (lb_init || (lb_init = (lb)->first))) { \ - lb_iter = lb_init; \ - do { + if ((lb)->first && (lb_init || (lb_init = (lb)->first))) { \ + lb_iter = lb_init; \ + do { #define LISTBASE_CIRCULAR_FORWARD_END(lb, lb_iter, lb_init) \ - } while ((lb_iter = (lb_iter)->next ? (lb_iter)->next : (lb)->first), \ - (lb_iter != lb_init)); \ -} ((void)0) + } \ + while ((lb_iter = (lb_iter)->next ? (lb_iter)->next : (lb)->first), (lb_iter != lb_init)) \ + ; \ + } \ + ((void)0) #define LISTBASE_CIRCULAR_BACKWARD_BEGIN(lb, lb_iter, lb_init) \ -if ((lb)->last && (lb_init || (lb_init = (lb)->last))) { \ - lb_iter = lb_init; \ - do { + if ((lb)->last && (lb_init || (lb_init = (lb)->last))) { \ + lb_iter = lb_init; \ + do { #define LISTBASE_CIRCULAR_BACKWARD_END(lb, lb_iter, lb_init) \ - } while ((lb_iter = (lb_iter)->prev ? (lb_iter)->prev : (lb)->last), \ - (lb_iter != lb_init)); \ -} ((void)0) + } \ + while ((lb_iter = (lb_iter)->prev ? (lb_iter)->prev : (lb)->last), (lb_iter != lb_init)) \ + ; \ + } \ + ((void)0) #define LISTBASE_FOREACH(type, var, list) \ - for (type var = (type)((list)->first); \ - var != NULL; \ - var = (type)(((Link *)(var))->next)) + for (type var = (type)((list)->first); var != NULL; var = (type)(((Link *)(var))->next)) /** A verion of #LISTBASE_FOREACH that supports removing the item we're looping over. */ #define LISTBASE_FOREACH_MUTABLE(type, var, list) \ - for (type var = (type)((list)->first), *var##_iter_next; \ - ((var != NULL) ? ((void)(var##_iter_next = (type)(((Link *)(var))->next)), 1) : 0); \ - var = var##_iter_next) + for (type var = (type)((list)->first), *var##_iter_next; \ + ((var != NULL) ? ((void)(var##_iter_next = (type)(((Link *)(var))->next)), 1) : 0); \ + var = var##_iter_next) #ifdef __cplusplus } #endif -#endif /* __BLI_LISTBASE_H__ */ +#endif /* __BLI_LISTBASE_H__ */ -- cgit v1.2.3