mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pod-iter: remove broken _FOREACH_SAFE

Browse source
This commit is contained in:
Wim Taymans 2017-11-29 13:22:25 +01:00
parent 140c3959ab
commit ada3698355
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/include/spa/pod/iter.h
View file

@ -79,12 +79,6 @@ static inline struct spa_pod *spa_pod_next(const struct spa_pod *iter)
spa_pod_is_inside(pod, size, iter); \ spa_pod_is_inside(pod, size, iter); \
(iter) = spa_pod_next(iter)) (iter) = spa_pod_next(iter))
#define SPA_POD_FOREACH_SAFE(pod, size, iter, tmp) \
for ((iter) = (pod), (tmp) = spa_pod_next(iter); \
spa_pod_is_inside(pod, size, iter); \
(iter) = (tmp), \
(tmp) = spa_pod_next(iter))
#define SPA_POD_CONTENTS_FOREACH(pod, offset, iter) \ #define SPA_POD_CONTENTS_FOREACH(pod, offset, iter) \
SPA_POD_FOREACH(SPA_MEMBER((pod), (offset), struct spa_pod),SPA_POD_SIZE (pod)-(offset),iter) SPA_POD_FOREACH(SPA_MEMBER((pod), (offset), struct spa_pod),SPA_POD_SIZE (pod)-(offset),iter)

6
spa/lib/pod.c
View file

@ -132,7 +132,7 @@ static inline struct spa_pod_prop *find_prop(const struct spa_pod *pod, uint32_t
return NULL; return NULL;
} }
static int static inline int
filter_prop(struct spa_pod_builder *b, filter_prop(struct spa_pod_builder *b,
const struct spa_pod_prop *p1, const struct spa_pod_prop *p1,
const struct spa_pod_prop *p2) const struct spa_pod_prop *p2)
@ -298,12 +298,12 @@ int pod_filter(struct spa_pod_builder *b,
const struct spa_pod *pod, uint32_t pod_size, const struct spa_pod *pod, uint32_t pod_size,
const struct spa_pod *filter, uint32_t filter_size) const struct spa_pod *filter, uint32_t filter_size)
{ {
const struct spa_pod *pp, *pf, *tmp; const struct spa_pod *pp, *pf;
int res = 0; int res = 0;
pf = filter; pf = filter;
SPA_POD_FOREACH_SAFE(pod, pod_size, pp, tmp) { SPA_POD_FOREACH(pod, pod_size, pp) {
bool do_copy = false, do_advance = false; bool do_copy = false, do_advance = false;
uint32_t filter_offset = 0; uint32_t filter_offset = 0;