diff options
author | David Lamparter <equinox@diac24.net> | 2021-02-21 06:38:13 +0100 |
---|---|---|
committer | David Lamparter <equinox@diac24.net> | 2021-03-17 06:18:37 +0100 |
commit | 96244aca23adec551c29b78f26605f8af8eea53e (patch) | |
tree | 1f4b4216f3a73e5bddffa2898495a74b2992af0f /bgpd | |
parent | *: require semicolon after DEFINE_HOOK & co. (diff) | |
download | frr-96244aca23adec551c29b78f26605f8af8eea53e.tar.xz frr-96244aca23adec551c29b78f26605f8af8eea53e.zip |
*: require semicolon after DEFINE_QOBJ & co.
Again, see previous commits.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'bgpd')
-rw-r--r-- | bgpd/bgp_bmp.c | 2 | ||||
-rw-r--r-- | bgpd/bgp_bmp.h | 4 | ||||
-rw-r--r-- | bgpd/bgp_evpn.c | 4 | ||||
-rw-r--r-- | bgpd/bgp_evpn_mh.h | 4 | ||||
-rw-r--r-- | bgpd/bgp_evpn_private.h | 4 | ||||
-rw-r--r-- | bgpd/bgpd.c | 6 | ||||
-rw-r--r-- | bgpd/bgpd.h | 12 | ||||
-rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.c | 4 | ||||
-rw-r--r-- | bgpd/rfapi/bgp_rfapi_cfg.h | 8 |
9 files changed, 24 insertions, 24 deletions
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 996b3d038..f733042f7 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -73,7 +73,7 @@ DEFINE_MTYPE_STATIC(BMP, BMP_MIRRORQ, "BMP route mirroring buffer"); DEFINE_MTYPE_STATIC(BMP, BMP_PEER, "BMP per BGP peer data"); DEFINE_MTYPE_STATIC(BMP, BMP_OPEN, "BMP stored BGP OPEN message"); -DEFINE_QOBJ_TYPE(bmp_targets) +DEFINE_QOBJ_TYPE(bmp_targets); static int bmp_bgp_cmp(const struct bmp_bgp *a, const struct bmp_bgp *b) { diff --git a/bgpd/bgp_bmp.h b/bgpd/bgp_bmp.h index 262451a78..10ca1e80f 100644 --- a/bgpd/bgp_bmp.h +++ b/bgpd/bgp_bmp.h @@ -245,9 +245,9 @@ struct bmp_targets { uint64_t cnt_accept, cnt_aclrefused; - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(bmp_targets) +DECLARE_QOBJ_TYPE(bmp_targets); /* per struct peer * data. Lookup by peer->qobj_node.nid, created on demand, * deleted in peer_backward hook. */ diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c index 7b29f1e4c..ec7126408 100644 --- a/bgpd/bgp_evpn.c +++ b/bgpd/bgp_evpn.c @@ -57,8 +57,8 @@ /* * Definitions and external declarations. */ -DEFINE_QOBJ_TYPE(bgpevpn) -DEFINE_QOBJ_TYPE(bgp_evpn_es) +DEFINE_QOBJ_TYPE(bgpevpn); +DEFINE_QOBJ_TYPE(bgp_evpn_es); /* diff --git a/bgpd/bgp_evpn_mh.h b/bgpd/bgp_evpn_mh.h index e5186619f..1053e3f02 100644 --- a/bgpd/bgp_evpn_mh.h +++ b/bgpd/bgp_evpn_mh.h @@ -125,9 +125,9 @@ struct bgp_evpn_es { /* preference config for BUM-DF election. advertised via the ESR. */ uint16_t df_pref; - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(bgp_evpn_es) +DECLARE_QOBJ_TYPE(bgp_evpn_es); RB_HEAD(bgp_es_rb_head, bgp_evpn_es); RB_PROTOTYPE(bgp_es_rb_head, bgp_evpn_es, rb_node, bgp_es_rb_cmp); diff --git a/bgpd/bgp_evpn_private.h b/bgpd/bgp_evpn_private.h index 77b374634..ff4970af4 100644 --- a/bgpd/bgp_evpn_private.h +++ b/bgpd/bgp_evpn_private.h @@ -112,10 +112,10 @@ struct bgpevpn { /* List of local ESs */ struct list *local_es_evi_list; - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(bgpevpn) +DECLARE_QOBJ_TYPE(bgpevpn); /* Mapping of Import RT to VNIs. * The Import RTs of all VNIs are maintained in a hash table with each diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 993caf6b9..666dfe0ed 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -93,9 +93,9 @@ DEFINE_MTYPE_STATIC(BGPD, PEER_TX_SHUTDOWN_MSG, "Peer shutdown message (TX)"); DEFINE_MTYPE_STATIC(BGPD, BGP_EVPN_INFO, "BGP EVPN instance information"); -DEFINE_QOBJ_TYPE(bgp_master) -DEFINE_QOBJ_TYPE(bgp) -DEFINE_QOBJ_TYPE(peer) +DEFINE_QOBJ_TYPE(bgp_master); +DEFINE_QOBJ_TYPE(bgp); +DEFINE_QOBJ_TYPE(peer); DEFINE_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp)); /* BGP process wide configuration. */ diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index a9ee7666d..52c9491ff 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -175,9 +175,9 @@ struct bgp_master { #define BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA (1 << 1) bool terminating; /* global flag that sigint terminate seen */ - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(bgp_master) +DECLARE_QOBJ_TYPE(bgp_master); /* BGP route-map structure. */ struct bgp_rmap { @@ -710,9 +710,9 @@ struct bgp { /* BGP route flap dampening configuration */ struct bgp_damp_config damp[AFI_MAX][SAFI_MAX]; - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(bgp) +DECLARE_QOBJ_TYPE(bgp); DECLARE_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp)); DECLARE_HOOK(bgp_inst_config_write, @@ -1574,9 +1574,9 @@ struct peer { bool advmap_config_change[AFI_MAX][SAFI_MAX]; bool advmap_table_change; - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(peer) +DECLARE_QOBJ_TYPE(peer); /* Inherit peer attribute from peer-group. */ #define PEER_ATTR_INHERIT(peer, group, attr) \ diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 3ad0b070b..cc6426138 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -80,8 +80,8 @@ DEFINE_MTYPE(RFAPI, RFAPI_L2ADDR_OPT, "RFAPI L2 Address Option"); DEFINE_MTYPE(RFAPI, RFAPI_AP, "RFAPI Advertised Prefix"); DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ETH, "RFAPI Monitor Ethernet"); -DEFINE_QOBJ_TYPE(rfapi_nve_group_cfg) -DEFINE_QOBJ_TYPE(rfapi_l2_group_cfg) +DEFINE_QOBJ_TYPE(rfapi_nve_group_cfg); +DEFINE_QOBJ_TYPE(rfapi_l2_group_cfg); /*********************************************************************** * RFAPI Support ***********************************************************************/ diff --git a/bgpd/rfapi/bgp_rfapi_cfg.h b/bgpd/rfapi/bgp_rfapi_cfg.h index f1548a617..ef97419c4 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.h +++ b/bgpd/rfapi/bgp_rfapi_cfg.h @@ -35,9 +35,9 @@ struct rfapi_l2_group_cfg { struct ecommunity *rt_export_list; void *rfp_cfg; /* rfp owned group config */ - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(rfapi_l2_group_cfg) +DECLARE_QOBJ_TYPE(rfapi_l2_group_cfg); typedef enum { RFAPI_GROUP_CFG_NVE = 1, @@ -108,9 +108,9 @@ struct rfapi_nve_group_cfg { /* for VRF type groups */ uint32_t label; struct rfapi_descriptor *rfd; - QOBJ_FIELDS + QOBJ_FIELDS; }; -DECLARE_QOBJ_TYPE(rfapi_nve_group_cfg) +DECLARE_QOBJ_TYPE(rfapi_nve_group_cfg); struct rfapi_rfg_name { struct rfapi_nve_group_cfg *rfg; |