X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fclassifier.h;h=09b3a131af2a75f6e1a62f8d59105f155db9aba4;hb=55d2690646769467b6d26ad55516ff6eeb12869d;hp=fdc3af7af02c1f024ddfff53e71bade7a9a580a4;hpb=21a0e105f175926d1d10d324565915ccb96fd28b;p=sliver-openvswitch.git

diff --git a/lib/classifier.h b/lib/classifier.h
index fdc3af7af..09b3a131a 100644
--- a/lib/classifier.h
+++ b/lib/classifier.h
@@ -124,13 +124,13 @@ struct cls_rule *cls_cursor_next(struct cls_cursor *, struct cls_rule *);
 
 #define CLS_CURSOR_FOR_EACH(RULE, MEMBER, CURSOR)                       \
     for (ASSIGN_CONTAINER(RULE, cls_cursor_first(CURSOR), MEMBER);      \
-         &(RULE)->MEMBER != NULL;                                       \
+         RULE != OBJECT_CONTAINING(NULL, RULE, MEMBER);                 \
          ASSIGN_CONTAINER(RULE, cls_cursor_next(CURSOR, &(RULE)->MEMBER), \
                           MEMBER))
 
 #define CLS_CURSOR_FOR_EACH_SAFE(RULE, NEXT, MEMBER, CURSOR)            \
     for (ASSIGN_CONTAINER(RULE, cls_cursor_first(CURSOR), MEMBER);      \
-         (&(RULE)->MEMBER != NULL                                       \
+         (RULE != OBJECT_CONTAINING(NULL, RULE, MEMBER)                 \
           ? ASSIGN_CONTAINER(NEXT, cls_cursor_next(CURSOR, &(RULE)->MEMBER), \
                              MEMBER)                                    \
           : 0);                                                         \