From 5e4008cc2a9d30d0fe06cef93e7a1b9846d6dee4 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 22 Aug 2011 16:17:28 +0100 Subject: [PATCH] common/ring: RING_FOREACH_SAFE: use shorter version from qemu --- ring.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ring.h b/ring.h index bd030d2..304bc9a 100644 --- a/ring.h +++ b/ring.h @@ -136,11 +136,9 @@ static inline RingItem *ring_prev(Ring *ring, RingItem *pos) } #define RING_FOREACH_SAFE(var, next, ring) \ - for ((var) = ring_get_head(ring), \ - (next) = (var) ? ring_next(ring, (var)) : NULL; \ - (var); \ - (var) = (next), \ - (next) = (var) ? ring_next(ring, (var)) : NULL) + for ((var) = ring_get_head(ring); \ + (var) && ((next) = ring_next(ring, (var)), 1); \ + (var) = (next)) #define RING_FOREACH(var, ring) \