lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / isisd / isis_flags.h

diff --git a/isisd/isis_flags.h b/isisd/isis_flags.h
index c57f7788076f5f0b976bff7821ae3d5ed67208ac..b3449e1e5961d19a2354500a7a20f1511aa93ab7 100644 (file)
--- a/isisd/isis_flags.h
+++ b/isisd/isis_flags.h
@@ -39,19 +39,22 @@ struct flags {
 void flags_initialize(struct flags *flags);
 long int flags_get_index(struct flags *flags);
 void flags_free_index(struct flags *flags, long int index);
-int flags_any_set(u_int32_t *flags);
+int flags_any_set(uint32_t *flags);
 
-#define ISIS_SET_FLAG(F, C)                                                    \
+#define _ISIS_SET_FLAG(F, C)                                                   \
        {                                                                      \
-               F[C->idx >> 5] |= (1 << (C->idx & 0x1F));                      \
+               F[(C) >> 5] |= (1 << ((C)&0x1F));                              \
        }
+#define ISIS_SET_FLAG(F, C) _ISIS_SET_FLAG(F, C->idx)
 
-#define ISIS_CLEAR_FLAG(F, C)                                                  \
+#define _ISIS_CLEAR_FLAG(F, C)                                                 \
        {                                                                      \
-               F[C->idx >> 5] &= ~(1 << (C->idx & 0x1F));                     \
+               F[(C) >> 5] &= ~(1 << ((C)&0x1F));                             \
        }
+#define ISIS_CLEAR_FLAG(F, C) _ISIS_CLEAR_FLAG(F, C->idx)
 
-#define ISIS_CHECK_FLAG(F, C)  (F[(C)->idx>>5] & (1<<(C->idx & 0x1F)))
+#define _ISIS_CHECK_FLAG(F, C)  (F[(C)>>5] & (1<<((C) & 0x1F)))
+#define ISIS_CHECK_FLAG(F, C) _ISIS_CHECK_FLAG(F, C->idx)
 
 /* sets all u_32int_t flags to 1 */
 #define ISIS_FLAGS_SET_ALL(FLAGS)                                              \