mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some badly-behaved macros

Browse source 
Some macros evaluated their arguments more than once when it was not
needed, or were missing parentheses.
This commit is contained in:
Demi Marie Obenour 2022-09-01 17:02:44 -04:00
parent bb4f274ae0
commit 671a7102ff
46 changed files with 162 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

34
spa/include/spa/utils/list.h
View file

@ -44,7 +44,7 @@ struct spa_list {
struct spa_list *prev;
};
#define SPA_LIST_INIT(list) (struct spa_list){ list, list }
#define SPA_LIST_INIT(list) ((struct spa_list){ (list), (list) })
static inline void spa_list_init(struct spa_list *list)
{
@ -98,25 +98,25 @@ static inline void spa_list_remove(struct spa_list *elem)
(&(pos)->member == (head))
#define spa_list_next(pos, member) \
SPA_CONTAINER_OF((pos)->member.next, __typeof__(*pos), member)
SPA_CONTAINER_OF((pos)->member.next, __typeof__(*(pos)), member)
#define spa_list_prev(pos, member) \
SPA_CONTAINER_OF((pos)->member.prev, __typeof__(*pos), member)
SPA_CONTAINER_OF((pos)->member.prev, __typeof__(*(pos)), member)
#define spa_list_consume(pos, head, member) \
for (pos = spa_list_first(head, __typeof__(*pos), member); \
for ((pos) = spa_list_first(head, __typeof__(*(pos)), member); \
!spa_list_is_empty(head); \
pos = spa_list_first(head, __typeof__(*pos), member))
(pos) = spa_list_first(head, __typeof__(*(pos)), member))
#define spa_list_for_each_next(pos, head, curr, member) \
for (pos = spa_list_first(curr, __typeof__(*pos), member); \
for ((pos) = spa_list_first(curr, __typeof__(*(pos)), member); \
!spa_list_is_end(pos, head, member); \
pos = spa_list_next(pos, member))
(pos) = spa_list_next(pos, member))
#define spa_list_for_each_prev(pos, head, curr, member) \
for (pos = spa_list_last(curr, __typeof__(*pos), member); \
for ((pos) = spa_list_last(curr, __typeof__(*(pos)), member); \
!spa_list_is_end(pos, head, member); \
pos = spa_list_prev(pos, member))
(pos) = spa_list_prev(pos, member))
#define spa_list_for_each(pos, head, member) \
spa_list_for_each_next(pos, head, head, member)
@ -125,16 +125,16 @@ static inline void spa_list_remove(struct spa_list *elem)
spa_list_for_each_prev(pos, head, head, member)
#define spa_list_for_each_safe_next(pos, tmp, head, curr, member) \
for (pos = spa_list_first(curr, __typeof__(*pos), member); \
tmp = spa_list_next(pos, member), \
for ((pos) = spa_list_first(curr, __typeof__(*(pos)), member); \
(tmp) = spa_list_next(pos, member), \
!spa_list_is_end(pos, head, member); \
pos = tmp)
(pos) = (tmp))
#define spa_list_for_each_safe_prev(pos, tmp, head, curr, member) \
for (pos = spa_list_last(curr, __typeof__(*pos), member); \
tmp = spa_list_prev(pos, member), \
for ((pos) = spa_list_last(curr, __typeof__(*(pos)), member); \
(tmp) = spa_list_prev(pos, member), \
!spa_list_is_end(pos, head, member); \
pos = tmp)
(pos) = (tmp))
#define spa_list_for_each_safe(pos, tmp, head, member) \
spa_list_for_each_safe_next(pos, tmp, head, head, member)
@ -146,11 +146,11 @@ static inline void spa_list_remove(struct spa_list *elem)
spa_list_prepend(head, &(cursor).member)
#define spa_list_for_each_cursor(pos, cursor, head, member) \
for(pos = spa_list_first(&(cursor).member, __typeof__(*(pos)), member); \
for((pos) = spa_list_first(&(cursor).member, __typeof__(*(pos)), member); \
spa_list_remove(&(pos)->member), \
spa_list_append(&(cursor).member, &(pos)->member), \
!spa_list_is_end(pos, head, member); \
pos = spa_list_next(&cursor, member))
(pos) = spa_list_next(&(cursor), member))
#define spa_list_cursor_end(cursor, member) \
spa_list_remove(&(cursor).member)