common/ring: RING_FOREACH_SAFE: use shorter version from qemu

1 files changed, 3 insertions, 5 deletions

diff --git a/common/ring.h b/common/ring.h
index bd030d2..304bc9a 100644
--- a/common/ring.h
+++ b/common/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)                 \