From ada3698355a3d6a8e37c8c42e45b570e4f1f4244 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 29 Nov 2017 13:22:25 +0100 Subject: [PATCH] pod-iter: remove broken _FOREACH_SAFE --- spa/include/spa/pod/iter.h | 6 ------ spa/lib/pod.c | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/spa/include/spa/pod/iter.h b/spa/include/spa/pod/iter.h index a92a42ec2..1e2bdeadd 100644 --- a/spa/include/spa/pod/iter.h +++ b/spa/include/spa/pod/iter.h @@ -79,12 +79,6 @@ static inline struct spa_pod *spa_pod_next(const struct spa_pod *iter) spa_pod_is_inside(pod, size, 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) \ SPA_POD_FOREACH(SPA_MEMBER((pod), (offset), struct spa_pod),SPA_POD_SIZE (pod)-(offset),iter) diff --git a/spa/lib/pod.c b/spa/lib/pod.c index a9acef8da..43967a98f 100644 --- a/spa/lib/pod.c +++ b/spa/lib/pod.c @@ -132,7 +132,7 @@ static inline struct spa_pod_prop *find_prop(const struct spa_pod *pod, uint32_t return NULL; } -static int +static inline int filter_prop(struct spa_pod_builder *b, const struct spa_pod_prop *p1, 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 *filter, uint32_t filter_size) { - const struct spa_pod *pp, *pf, *tmp; + const struct spa_pod *pp, *pf; int res = 0; 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; uint32_t filter_offset = 0;