*: require semicolon after DEFINE_HOOK & co.

See previous commit.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 757d76f69e0da0a480cfe97f941ab915c0f3e915..dbde39be03bc08bd86829ab38255ffc57fab8ee9 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -57,8 +57,8 @@
 #include "bgpd/bgp_zebra.h"
 #include "bgpd/bgp_vty.h"
 
-DEFINE_HOOK(peer_backward_transition, (struct peer * peer), (peer))
-DEFINE_HOOK(peer_status_changed, (struct peer * peer), (peer))
+DEFINE_HOOK(peer_backward_transition, (struct peer * peer), (peer));
+DEFINE_HOOK(peer_status_changed, (struct peer * peer), (peer));
 
 /* Definition of display strings corresponding to FSM events. This should be
  * kept consistent with the events defined in bgpd.h

diff --git a/bgpd/bgp_fsm.h b/bgpd/bgp_fsm.h
index bf4966c839760e20c5ba91755b11294595d9acf9..bcf697e153fb4275d3d777d4c4c54c6b820fc555 100644 (file)
--- a/bgpd/bgp_fsm.h
+++ b/bgpd/bgp_fsm.h
@@ -155,8 +155,8 @@ extern void bgp_start_routeadv(struct bgp *);
 extern void bgp_adjust_routeadv(struct peer *);
 
 #include "hook.h"
-DECLARE_HOOK(peer_backward_transition, (struct peer *peer), (peer))
-DECLARE_HOOK(peer_established, (struct peer *peer), (peer))
+DECLARE_HOOK(peer_backward_transition, (struct peer *peer), (peer));
+DECLARE_HOOK(peer_established, (struct peer *peer), (peer));
 
 int bgp_gr_update_all(struct bgp *bgp, int global_gr_cmd);
 int bgp_neighbor_graceful_restart(struct peer *peer, int peer_gr_cmd);

diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c
index 721ce5b5c6c4190e28c31d2e0692f5c96f884c1f..adb0e17d29a416c34f78d63855cb6e4201253f42 100644 (file)
--- a/bgpd/bgp_nb_config.c
+++ b/bgpd/bgp_nb_config.c
@@ -32,7 +32,7 @@
 #include "bgpd/bgp_io.h"
 #include "bgpd/bgp_damp.h"
 
-DEFINE_HOOK(bgp_snmp_init_stats, (struct bgp *bgp), (bgp))
+DEFINE_HOOK(bgp_snmp_init_stats, (struct bgp *bgp), (bgp));
 
 FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY,
         { .val_ulong = 10, .match_profile = "datacenter", },

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index f04b89594ee97848659b6755531fdd692bbfd244..de85bfb3bbb77bc4ab5f075c307160295cc95031 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -68,12 +68,12 @@
 DEFINE_HOOK(bgp_packet_dump,
                (struct peer *peer, uint8_t type, bgp_size_t size,
                        struct stream *s),
-               (peer, type, size, s))
+               (peer, type, size, s));
 
 DEFINE_HOOK(bgp_packet_send,
                (struct peer *peer, uint8_t type, bgp_size_t size,
                        struct stream *s),
-               (peer, type, size, s))
+               (peer, type, size, s));
 
 /**
  * Sets marker and type fields for a BGP message.

diff --git a/bgpd/bgp_packet.h b/bgpd/bgp_packet.h
index d32f091d0c87ea0e3eeaccfa39e964a6f0baa94e..d69c86230439fc038675614981319ac9525e9791 100644 (file)
--- a/bgpd/bgp_packet.h
+++ b/bgpd/bgp_packet.h
@@ -26,12 +26,12 @@
 DECLARE_HOOK(bgp_packet_dump,
                (struct peer *peer, uint8_t type, bgp_size_t size,
                        struct stream *s),
-               (peer, type, size, s))
+               (peer, type, size, s));
 
 DECLARE_HOOK(bgp_packet_send,
                (struct peer *peer, uint8_t type, bgp_size_t size,
                        struct stream *s),
-               (peer, type, size, s))
+               (peer, type, size, s));
 
 #define BGP_NLRI_LENGTH       1U
 #define BGP_TOTAL_ATTR_LEN    2U

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 87fd5f28ca5296fcd9d12b106d067d19488ab93e..124a477248ea233c068b9e6c10a4cf556de22194 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -95,12 +95,12 @@
 
 DEFINE_HOOK(bgp_snmp_update_stats,
            (struct bgp_node *rn, struct bgp_path_info *pi, bool added),
-           (rn, pi, added))
+           (rn, pi, added));
 
 DEFINE_HOOK(bgp_rpki_prefix_status,
            (struct peer *peer, struct attr *attr,
             const struct prefix *prefix),
-           (peer, attr, prefix))
+           (peer, attr, prefix));
 
 /* Extern from bgp_dump.c */
 extern const char *bgp_origin_str[];
@@ -126,7 +126,7 @@ static const struct message bgp_pmsi_tnltype_str[] = {
 DEFINE_HOOK(bgp_process,
            (struct bgp * bgp, afi_t afi, safi_t safi, struct bgp_dest *bn,
             struct peer *peer, bool withdraw),
-           (bgp, afi, safi, bn, peer, withdraw))
+           (bgp, afi, safi, bn, peer, withdraw));
 
 /** Test if path is suppressed. */
 static bool bgp_path_suppressed(struct bgp_path_info *pi)

diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 766e5ade92f23ba47d40d193de2f11fbfb7ea10f..1dec99f08572b977d7921707e6e7239d05f49428 100644 (file)
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -550,7 +550,7 @@ static inline bool bgp_check_advertise(struct bgp *bgp, struct bgp_dest *dest)
 DECLARE_HOOK(bgp_process,
             (struct bgp * bgp, afi_t afi, safi_t safi, struct bgp_dest *bn,
              struct peer *peer, bool withdraw),
-            (bgp, afi, safi, bn, peer, withdraw))
+            (bgp, afi, safi, bn, peer, withdraw));
 
 /* BGP show options */
 #define BGP_SHOW_OPT_JSON (1 << 0)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index a4e56c95c8fc7150bf9533e936f61b8da75b9007..274e8248a077ee2463a3cbc81a8a8f5f6128ed43 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -126,8 +126,8 @@ FRR_CFG_DEFAULT_BOOL(BGP_SUPPRESS_DUPLICATES,
 
 DEFINE_HOOK(bgp_inst_config_write,
                (struct bgp *bgp, struct vty *vty),
-               (bgp, vty))
-DEFINE_HOOK(bgp_snmp_update_last_changed, (struct bgp *bgp), (bgp))
+               (bgp, vty));
+DEFINE_HOOK(bgp_snmp_update_last_changed, (struct bgp *bgp), (bgp));
 
 #define GR_NO_OPER                                                             \
        "The Graceful Restart No Operation was executed as cmd same as previous one."

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index c554332255df9f588b05b50db1d1cb5d02b988b9..afdd5123fb5a3255245e919677594d59586df632 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -69,7 +69,7 @@ struct zclient *zclient = NULL;
 
 /* hook to indicate vrf status change for SNMP */
 DEFINE_HOOK(bgp_vrf_status_changed, (struct bgp *bgp, struct interface *ifp),
-           (bgp, ifp))
+           (bgp, ifp));
 
 /* Can we install into zebra? */
 static inline bool bgp_install_info_to_zebra(struct bgp *bgp)

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 33c8f3c1f097bdb2ffed30f089272d3e778ba7bd..993caf6b9d079e216032dd6a3679edcf9dd4fce9 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -96,7 +96,7 @@ 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_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp))
+DEFINE_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp));
 
 /* BGP process wide configuration.  */
 static struct bgp_master bgp_master;

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 3f5ec0779676f6d2c809d9f841c057ed61888d10..a9ee7666da7171a36d3d5a96777b87e4c6379979 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -714,10 +714,10 @@ struct bgp {
 };
 DECLARE_QOBJ_TYPE(bgp)
 
-DECLARE_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp))
+DECLARE_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp));
 DECLARE_HOOK(bgp_inst_config_write,
                (struct bgp *bgp, struct vty *vty),
-               (bgp, vty))
+               (bgp, vty));
 
 /* Thread callback information */
 struct afi_safi_info {
@@ -2364,17 +2364,17 @@ extern int bgp_lookup_by_as_name_type(struct bgp **bgp_val, as_t *as,
 
 /* Hooks */
 DECLARE_HOOK(bgp_vrf_status_changed, (struct bgp *bgp, struct interface *ifp),
-            (bgp, ifp))
-DECLARE_HOOK(peer_status_changed, (struct peer *peer), (peer))
-DECLARE_HOOK(bgp_snmp_init_stats, (struct bgp *bgp), (bgp))
-DECLARE_HOOK(bgp_snmp_update_last_changed, (struct bgp *bgp), (bgp))
+            (bgp, ifp));
+DECLARE_HOOK(peer_status_changed, (struct peer *peer), (peer));
+DECLARE_HOOK(bgp_snmp_init_stats, (struct bgp *bgp), (bgp));
+DECLARE_HOOK(bgp_snmp_update_last_changed, (struct bgp *bgp), (bgp));
 DECLARE_HOOK(bgp_snmp_update_stats,
             (struct bgp_node *rn, struct bgp_path_info *pi, bool added),
-            (rn, pi, added))
+            (rn, pi, added));
 DECLARE_HOOK(bgp_rpki_prefix_status,
             (struct peer * peer, struct attr *attr,
              const struct prefix *prefix),
-            (peer, attr, prefix))
+            (peer, attr, prefix));
 
 void peer_nsf_stop(struct peer *peer);
 

diff --git a/doc/developer/hooks.rst b/doc/developer/hooks.rst
index 10fe6b9c43605b656e94978a6df37455128eec61..b37a4aeea7aa01018afe62617206de8db4e43a74 100644 (file)
--- a/doc/developer/hooks.rst
+++ b/doc/developer/hooks.rst
@@ -15,13 +15,13 @@ Example:
    :caption: mydaemon.h
 
    #include "hook.h"
-   DECLARE_HOOK(some_update_event, (struct eventinfo *info), (info))
+   DECLARE_HOOK(some_update_event, (struct eventinfo *info), (info));
 
 .. code-block:: c
    :caption: mydaemon.c
 
    #include "mydaemon.h"
-   DEFINE_HOOK(some_update_event, (struct eventinfo *info), (info))
+   DEFINE_HOOK(some_update_event, (struct eventinfo *info), (info));
    ...
    hook_call(some_update_event, info);
 
@@ -110,9 +110,9 @@ Definition
 
    .. code-block:: c
 
-      DECLARE_HOOK(foo, (), ())
-      DECLARE_HOOK(bar, (int arg), (arg))
-      DECLARE_HOOK(baz, (const void *x, in_addr_t y), (x, y))
+      DECLARE_HOOK(foo, (), ());
+      DECLARE_HOOK(bar, (int arg), (arg));
+      DECLARE_HOOK(baz, (const void *x, in_addr_t y), (x, y));
 
 .. c:macro:: DEFINE_HOOK(name, arglist, passlist)
 

diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index 3c3a68764e3c4ca480e49d9e6dd44a13ab0ad830..cb7038085f37841887831b452b5fb4dc47c568dc 100644 (file)
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -146,7 +146,7 @@ struct isis_adjacency *isis_adj_find(const struct isis_area *area, int level,
        return NULL;
 }
 
-DEFINE_HOOK(isis_adj_state_change_hook, (struct isis_adjacency *adj), (adj))
+DEFINE_HOOK(isis_adj_state_change_hook, (struct isis_adjacency *adj), (adj));
 
 void isis_delete_adj(void *arg)
 {

diff --git a/isisd/isis_adjacency.h b/isisd/isis_adjacency.h
index 3afb7209f3db24b15e5dba0e5c3c4cdf4a0b2641..5f3adcdf45af93bc3ad7934b005fce27a475685b 100644 (file)
--- a/isisd/isis_adjacency.h
+++ b/isisd/isis_adjacency.h
@@ -123,11 +123,11 @@ void isis_delete_adj(void *adj);
 void isis_adj_process_threeway(struct isis_adjacency *adj,
                               struct isis_threeway_adj *tw_adj,
                               enum isis_adj_usage adj_usage);
-DECLARE_HOOK(isis_adj_state_change_hook, (struct isis_adjacency *adj), (adj))
+DECLARE_HOOK(isis_adj_state_change_hook, (struct isis_adjacency *adj), (adj));
 DECLARE_HOOK(isis_adj_ip_enabled_hook,
-            (struct isis_adjacency *adj, int family), (adj, family))
+            (struct isis_adjacency *adj, int family), (adj, family));
 DECLARE_HOOK(isis_adj_ip_disabled_hook,
-            (struct isis_adjacency *adj, int family), (adj, family))
+            (struct isis_adjacency *adj, int family), (adj, family));
 void isis_log_adj_change(struct isis_adjacency *adj,
                         enum isis_adj_state old_state,
                         enum isis_adj_state new_state, const char *reason);

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 62822cbf89f96f95bc2ab7060c54afb201b6b37a..0c59826ddca45a54ec67a19195aa0f8339f26d65 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -63,7 +63,7 @@
 
 DEFINE_QOBJ_TYPE(isis_circuit)
 
-DEFINE_HOOK(isis_if_new_hook, (struct interface *ifp), (ifp))
+DEFINE_HOOK(isis_if_new_hook, (struct interface *ifp), (ifp));
 
 /*
  * Prototypes.
@@ -308,7 +308,7 @@ struct isis_circuit *circuit_scan_by_ifp(struct interface *ifp)
 }
 
 DEFINE_HOOK(isis_circuit_add_addr_hook, (struct isis_circuit *circuit),
-           (circuit))
+           (circuit));
 
 void isis_circuit_add_addr(struct isis_circuit *circuit,
                           struct connected *connected)
@@ -1085,7 +1085,7 @@ void isis_circuit_print_vty(struct isis_circuit *circuit, struct vty *vty,
 #ifdef FABRICD
 DEFINE_HOOK(isis_circuit_config_write,
            (struct isis_circuit *circuit, struct vty *vty),
-           (circuit, vty))
+           (circuit, vty));
 
 static int isis_interface_config_write(struct vty *vty)
 {

diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h
index 15d58bd7369b0dcc26f08573f7741f1d143c9fbb..62d0478864cfd7f0e19e1c4c1b1f565fecad9495 100644 (file)
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -231,10 +231,10 @@ int isis_circuit_mt_enabled_set(struct isis_circuit *circuit, uint16_t mtid,
 #ifdef FABRICD
 DECLARE_HOOK(isis_circuit_config_write,
            (struct isis_circuit *circuit, struct vty *vty),
-           (circuit, vty))
+           (circuit, vty));
 #endif
 
 DECLARE_HOOK(isis_circuit_add_addr_hook, (struct isis_circuit *circuit),
-            (circuit))
+            (circuit));
 
 #endif /* _ZEBRA_ISIS_CIRCUIT_H */

diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index e1baf351f49952a22bad9fb68624c59a91e4784b..ed5fadde10208086f2d0327270f785ad53131db9 100644 (file)
--- a/isisd/isis_route.c
+++ b/isisd/isis_route.c
@@ -53,7 +53,7 @@
 DEFINE_HOOK(isis_route_update_hook,
            (struct isis_area * area, struct prefix *prefix,
             struct isis_route_info *route_info),
-           (area, prefix, route_info))
+           (area, prefix, route_info));
 
 static struct isis_nexthop *nexthoplookup(struct list *nexthops, int family,
                                          union g_addr *ip, ifindex_t ifindex);

diff --git a/isisd/isis_route.h b/isisd/isis_route.h
index d6763ec76c10e267ac3494aed32930eeae7b9e31..0e206d08f419bc80fd504eb986dad2cc02805a0d 100644 (file)
--- a/isisd/isis_route.h
+++ b/isisd/isis_route.h
@@ -52,7 +52,7 @@ struct isis_route_info {
 DECLARE_HOOK(isis_route_update_hook,
             (struct isis_area * area, struct prefix *prefix,
              struct isis_route_info *route_info),
-            (area, prefix, route_info))
+            (area, prefix, route_info));
 
 void isis_nexthop_delete(struct isis_nexthop *nexthop);
 void adjinfo2nexthop(int family, struct list *nexthops,

diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c
index fa47c2813cec61eb17355a3eee5b2c7a6f9751a4..6af9290467e76c025164cbcb2614aa6678011a9a 100644 (file)
--- a/isisd/isis_tlvs.c
+++ b/isisd/isis_tlvs.c
@@ -4488,9 +4488,9 @@ static void tlvs_protocols_supported_to_adj(struct isis_tlvs *tlvs,
 }
 
 DEFINE_HOOK(isis_adj_ip_enabled_hook, (struct isis_adjacency *adj, int family),
-           (adj, family))
+           (adj, family));
 DEFINE_HOOK(isis_adj_ip_disabled_hook,
-           (struct isis_adjacency *adj, int family), (adj, family))
+           (struct isis_adjacency *adj, int family), (adj, family));
 
 static void tlvs_ipv4_addresses_to_adj(struct isis_tlvs *tlvs,
                                       struct isis_adjacency *adj,

diff --git a/isisd/isisd.h b/isisd/isisd.h
index 1b0ec2b4f0ac233e592159bd2dea91496a2794d6..4166216f9f3ea7525ef7505700f1af279c23c27f 100644 (file)
--- a/isisd/isisd.h
+++ b/isisd/isisd.h
@@ -240,7 +240,7 @@ struct isis_area {
 };
 DECLARE_QOBJ_TYPE(isis_area)
 
-DECLARE_HOOK(isis_area_overload_bit_update, (struct isis_area * area), (area))
+DECLARE_HOOK(isis_area_overload_bit_update, (struct isis_area * area), (area));
 
 void isis_terminate(void);
 void isis_finish(struct isis *isis);

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 14235a0f1f971a04565463dc7d56bce12c73865a..2ee2dc12faa09642c24181b89add593cceff26d6 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -88,7 +88,7 @@ static pid_t           lde_pid;
 
 static struct frr_daemon_info ldpd_di;
 
-DEFINE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm))
+DEFINE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm));
 
 static void ldp_load_module(const char *name)
 {

diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h
index 73c81349ce4babc409c96c79186f03fda06cd771..dd29c68f502d506877c839fc32db360f0e58a3fd 100644 (file)
--- a/ldpd/ldpd.h
+++ b/ldpd/ldpd.h
@@ -915,7 +915,7 @@ int          ldp_zebra_send_rlfa_labels(struct zapi_rlfa_response *
        (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_INTFACELOCAL))
 #endif
 
-DECLARE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm))
+DECLARE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm));
 
 extern void ldp_agentx_enabled(void);
 

diff --git a/ldpd/ldpe.h b/ldpd/ldpe.h
index 9572f1ac1280311d9c2da291821509bd7bccc9c0..880722424e33d3771f8df25ca4610ffa33b07952 100644 (file)
--- a/ldpd/ldpe.h
+++ b/ldpd/ldpe.h
@@ -321,6 +321,7 @@ void        ldpe_l2vpn_exit(struct l2vpn *);
 void   ldpe_l2vpn_pw_init(struct l2vpn_pw *);
 void   ldpe_l2vpn_pw_exit(struct l2vpn_pw *);
 
-DECLARE_HOOK(ldp_nbr_state_change, (struct nbr * nbr, int old_state), (nbr, old_state))
+DECLARE_HOOK(ldp_nbr_state_change, (struct nbr * nbr, int old_state),
+            (nbr, old_state));
 
 #endif /* _LDPE_H_ */

diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c
index 23c67ec1ca3380ef27a49a8bbdcb60918e3c1eb4..e884b3ebfc9ca6ec9158209dd2bcbab04fcda022 100644 (file)
--- a/ldpd/neighbor.c
+++ b/ldpd/neighbor.c
@@ -26,7 +26,8 @@
 #include "lde.h"
 #include "log.h"
 
-DEFINE_HOOK(ldp_nbr_state_change, (struct nbr * nbr, int old_state), (nbr, old_state))
+DEFINE_HOOK(ldp_nbr_state_change, (struct nbr * nbr, int old_state),
+           (nbr, old_state));
 
 static __inline int     nbr_id_compare(const struct nbr *, const struct nbr *);
 static __inline int     nbr_addr_compare(const struct nbr *,

diff --git a/lib/agentx.c b/lib/agentx.c
index c1ff7a61b1039da702f6045d9cc0cf95069f14af..3f1a8edbaa53a4617c28295072e3c9ed6b83608a 100644 (file)
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -36,7 +36,7 @@
 
 XREF_SETUP()
 
-DEFINE_HOOK(agentx_enabled, (), ())
+DEFINE_HOOK(agentx_enabled, (), ());
 
 static int agentx_enabled = 0;
 

diff --git a/lib/hook.h b/lib/hook.h
index bef5351e905765d5defc7922ab61c987e9709e79..ff3ef29fa3f25c09352a364eee4c04e024eab323 100644 (file)
--- a/lib/hook.h
+++ b/lib/hook.h
@@ -35,10 +35,10 @@ extern "C" {
  *
  *   mydaemon.h:
  *     #include "hook.h"
- *     DECLARE_HOOK (some_update_event, (struct eventinfo *info), (info))
+ *     DECLARE_HOOK (some_update_event, (struct eventinfo *info), (info));
  *
  *   mydaemon.c:
- *     DEFINE_HOOK (some_update_event, (struct eventinfo *info), (info))
+ *     DEFINE_HOOK (some_update_event, (struct eventinfo *info), (info));
  *     ...
  *     hook_call (some_update_event, info)
  *
@@ -184,7 +184,7 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
 #define HOOK_ADDARG(...) (hookarg , ## __VA_ARGS__)
 
 /* use in header file - declares the hook and its arguments
- * usage:  DECLARE_HOOK(my_hook, (int arg1, struct foo *arg2), (arg1, arg2))
+ * usage:  DECLARE_HOOK(my_hook, (int arg1, struct foo *arg2), (arg1, arg2));
  * as above, "passlist" must use the same order and same names as "arglist"
  *
  * theoretically passlist is not neccessary, but let's keep things simple and
@@ -201,7 +201,9 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
                int(*funcptr) HOOK_ADDDEF arglist)                             \
        {                                                                      \
                return (void *)funcptr;                                        \
-       }
+       }                                                                      \
+       MACRO_REQUIRE_SEMICOLON() /* end */
+
 #define DECLARE_KOOH(hookname, arglist, passlist)                              \
        DECLARE_HOOK(hookname, arglist, passlist)
 
@@ -230,7 +232,8 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
                                hooksum += hookp.farg HOOK_ADDARG passlist;    \
                }                                                              \
                return hooksum;                                                \
-       }
+       }                                                                      \
+       MACRO_REQUIRE_SEMICOLON() /* end */
 
 #define DEFINE_HOOK(hookname, arglist, passlist)                               \
        DEFINE_HOOK_INT(hookname, arglist, passlist, false)

diff --git a/lib/if.c b/lib/if.c
index 6af8aa6e0a599783a4546f4eb7de2de9fe1acb9c..d4016c28508adddd0ce54d8b54da2659526e0ac6 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -55,8 +55,8 @@ RB_GENERATE(if_index_head, interface, index_entry, if_cmp_index_func);
 
 DEFINE_QOBJ_TYPE(interface)
 
-DEFINE_HOOK(if_add, (struct interface * ifp), (ifp))
-DEFINE_KOOH(if_del, (struct interface * ifp), (ifp))
+DEFINE_HOOK(if_add, (struct interface * ifp), (ifp));
+DEFINE_KOOH(if_del, (struct interface * ifp), (ifp));
 
 static struct interface_master{
        int (*create_hook)(struct interface *ifp);

diff --git a/lib/if.h b/lib/if.h
index 1ea295fb43a410f31932d1809fd3f77a2f0d6a35..8c86841755991ec7ea53eec7bd8bdc29dff65b75 100644 (file)
--- a/lib/if.h
+++ b/lib/if.h
@@ -378,8 +378,8 @@ DECLARE_QOBJ_TYPE(interface)
  * can use 1000+ so they run after the daemon has initialised daemon-specific
  * interface data
  */
-DECLARE_HOOK(if_add, (struct interface * ifp), (ifp))
-DECLARE_KOOH(if_del, (struct interface * ifp), (ifp))
+DECLARE_HOOK(if_add, (struct interface * ifp), (ifp));
+DECLARE_KOOH(if_del, (struct interface * ifp), (ifp));
 
 #define METRIC_MAX (~0)
 

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 51b97369c92232c315d90d73f2f8a2c1e9788f8b..5b0a523fb51e76091b035d5cbc78178cfc51bae0 100644 (file)
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -45,10 +45,10 @@
 #include "defaults.h"
 #include "frrscript.h"
 
-DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm))
-DEFINE_HOOK(frr_very_late_init, (struct thread_master * tm), (tm))
-DEFINE_KOOH(frr_early_fini, (), ())
-DEFINE_KOOH(frr_fini, (), ())
+DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm));
+DEFINE_HOOK(frr_very_late_init, (struct thread_master * tm), (tm));
+DEFINE_KOOH(frr_early_fini, (), ());
+DEFINE_KOOH(frr_fini, (), ());
 
 const char frr_sysconfdir[] = SYSCONFDIR;
 char frr_vtydir[256];

diff --git a/lib/libfrr.h b/lib/libfrr.h
index 825f502bdf6dcd6a975ac96aea0dbb12c4100deb..c1af59891582cf4d6e88d2e8ef76b87605dcf040 100644 (file)
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -141,8 +141,8 @@ extern enum frr_cli_mode frr_get_cli_mode(void);
 extern uint32_t frr_get_fd_limit(void);
 extern bool frr_is_startup_fd(int fd);
 
-DECLARE_HOOK(frr_late_init, (struct thread_master * tm), (tm))
-DECLARE_HOOK(frr_very_late_init, (struct thread_master * tm), (tm))
+DECLARE_HOOK(frr_late_init, (struct thread_master * tm), (tm));
+DECLARE_HOOK(frr_very_late_init, (struct thread_master * tm), (tm));
 extern void frr_config_fork(void);
 
 extern void frr_run(struct thread_master *master);
@@ -153,10 +153,10 @@ extern bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
 
 /* these two are before the protocol daemon does its own shutdown
  * it's named this way being the counterpart to frr_late_init */
-DECLARE_KOOH(frr_early_fini, (), ())
+DECLARE_KOOH(frr_early_fini, (), ());
 extern void frr_early_fini(void);
 /* and these two are after the daemon did its own cleanup */
-DECLARE_KOOH(frr_fini, (), ())
+DECLARE_KOOH(frr_fini, (), ());
 extern void frr_fini(void);
 
 extern char config_default[512];

diff --git a/lib/log_vty.c b/lib/log_vty.c
index d1dcac23401203d523ec790d15ed0018863df28e..7dadca8059d810a8ead096281ff78ca7ab2d7785 100644 (file)
--- a/lib/log_vty.c
+++ b/lib/log_vty.c
@@ -33,7 +33,7 @@
 
 #define ZLOG_MAXLVL(a, b) MAX(a, b)
 
-DEFINE_HOOK(zlog_rotate, (), ())
+DEFINE_HOOK(zlog_rotate, (), ());
 
 static const int log_default_lvl = LOG_DEBUG;
 

diff --git a/lib/log_vty.h b/lib/log_vty.h
index 16c447546736a5c16b1b9c9706df97a786d37794..f0fb7d3dba0235db5be51355d048bf15fe79611a 100644 (file)
--- a/lib/log_vty.h
+++ b/lib/log_vty.h
@@ -34,7 +34,7 @@ extern void log_config_write(struct vty *vty);
 extern int log_level_match(const char *s);
 extern void log_show_syslog(struct vty *vty);
 
-DECLARE_HOOK(zlog_rotate, (), ())
+DECLARE_HOOK(zlog_rotate, (), ());
 extern void zlog_rotate(void);
 
 #ifdef __cplusplus

diff --git a/lib/northbound.h b/lib/northbound.h
index 3e1342f985b50bbf95612814b9339778bda21de0..21aad64a09f6b107341c472f1ff17249e3f939f2 100644 (file)
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -677,9 +677,9 @@ typedef int (*nb_oper_data_cb)(const struct lys_node *snode,
 
 /* Hooks. */
 DECLARE_HOOK(nb_notification_send, (const char *xpath, struct list *arguments),
-            (xpath, arguments))
-DECLARE_HOOK(nb_client_debug_config_write, (struct vty *vty), (vty))
-DECLARE_HOOK(nb_client_debug_set_all, (uint32_t flags, bool set), (flags, set))
+            (xpath, arguments));
+DECLARE_HOOK(nb_client_debug_config_write, (struct vty *vty), (vty));
+DECLARE_HOOK(nb_client_debug_set_all, (uint32_t flags, bool set), (flags, set));
 
 /* Northbound debugging records */
 extern struct debug nb_dbg_cbs_config;

diff --git a/lib/routing_nb.h b/lib/routing_nb.h
index ffba631a10763fd197e5754f1d86b09fa69b3cc6..bdd12b262b0ec4d42d554f041b474417f988d5bd 100644 (file)
--- a/lib/routing_nb.h
+++ b/lib/routing_nb.h
@@ -24,7 +24,7 @@ int routing_control_plane_protocols_control_plane_protocol_destroy(
  * callbacks for routing to handle configuration events
  * based on the control plane protocol
  */
-DECLARE_HOOK(routing_conf_event, (struct nb_cb_create_args *args), (args))
+DECLARE_HOOK(routing_conf_event, (struct nb_cb_create_args *args), (args));
 
 void routing_control_plane_protocols_register_vrf_dependency(void);
 

diff --git a/lib/routing_nb_config.c b/lib/routing_nb_config.c
index 17698d2b87984d358f762b80afa27e57884df1af..f66f32015dc141ffc7c25d8a1bee5115e64b0a38 100644 (file)
--- a/lib/routing_nb_config.c
+++ b/lib/routing_nb_config.c
@@ -24,7 +24,7 @@
 #include "routing_nb.h"
 
 
-DEFINE_HOOK(routing_conf_event, (struct nb_cb_create_args *args), (args))
+DEFINE_HOOK(routing_conf_event, (struct nb_cb_create_args *args), (args));
 
 /*
  * XPath: /frr-routing:routing/control-plane-protocols/control-plane-protocol

diff --git a/lib/smux.h b/lib/smux.h
index 57128b79284d42d8f8c17d7b10af584ddcafa580..c063833e41518e49910badea14e046d007e072da 100644 (file)
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -157,7 +157,7 @@ extern void oid_copy_int(oid oid[], int *val);
 extern void oid2string(oid oid[], int len, char *string);
 extern void oid_copy_str(oid oid[], const char *string, int len);
 
-DECLARE_HOOK(agentx_enabled, (), ())
+DECLARE_HOOK(agentx_enabled, (), ());
 
 #ifdef __cplusplus
 }

diff --git a/lib/zlog.c b/lib/zlog.c
index ca7f8da2ef60677801126f0f98413113aa60b023..7304854648ebdd74ed4ef75445c0715406c76780 100644 (file)
--- a/lib/zlog.c
+++ b/lib/zlog.c
@@ -59,10 +59,10 @@ DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF,   "log thread-local buffer");
 
 DEFINE_HOOK(zlog_init, (const char *progname, const char *protoname,
                        unsigned short instance, uid_t uid, gid_t gid),
-                      (progname, protoname, instance, uid, gid))
-DEFINE_KOOH(zlog_fini, (), ())
+                      (progname, protoname, instance, uid, gid));
+DEFINE_KOOH(zlog_fini, (), ());
 DEFINE_HOOK(zlog_aux_init, (const char *prefix, int prio_min),
-                          (prefix, prio_min))
+                          (prefix, prio_min));
 
 char zlog_prefix[128];
 size_t zlog_prefixsz;

diff --git a/lib/zlog.h b/lib/zlog.h
index 4fdb47bb9520822c92256382319374c2d96b6f25..d95b801b2cff397255271c3ae68883be2b3b9bf4 100644 (file)
--- a/lib/zlog.h
+++ b/lib/zlog.h
@@ -247,17 +247,17 @@ extern void zlog_init(const char *progname, const char *protoname,
                      unsigned short instance, uid_t uid, gid_t gid);
 DECLARE_HOOK(zlog_init, (const char *progname, const char *protoname,
                         unsigned short instance, uid_t uid, gid_t gid),
-                       (progname, protoname, instance, uid, gid))
+                       (progname, protoname, instance, uid, gid));
 
 extern void zlog_fini(void);
-DECLARE_KOOH(zlog_fini, (), ())
+DECLARE_KOOH(zlog_fini, (), ());
 
 /* for tools & test programs, i.e. anything not a daemon.
  * (no cleanup needed at exit)
  */
 extern void zlog_aux_init(const char *prefix, int prio_min);
 DECLARE_HOOK(zlog_aux_init, (const char *prefix, int prio_min),
-                           (prefix, prio_min))
+                           (prefix, prio_min));
 
 extern void zlog_startup_end(void);
 

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index c05d9cab16491118f5e0623fb3bc954f93d5e6a7..83950a4aaa124700108c671d4cb5ba9df173e720 100644 (file)
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -49,7 +49,7 @@ DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names");
 DEFINE_QOBJ_TYPE(ospf6_interface)
 DEFINE_HOOK(ospf6_interface_change,
            (struct ospf6_interface * oi, int state, int old_state),
-           (oi, state, old_state))
+           (oi, state, old_state));
 
 unsigned char conf_debug_ospf6_interface = 0;
 

diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h
index 6e4692920cba9b825bb3c736bcbc9b8444fad7a6..343a6d494f000eb84d393cd7320e9b5b0e2b921a 100644 (file)
--- a/ospf6d/ospf6_interface.h
+++ b/ospf6d/ospf6_interface.h
@@ -199,6 +199,6 @@ extern void install_element_ospf6_debug_interface(void);
 
 DECLARE_HOOK(ospf6_interface_change,
             (struct ospf6_interface * oi, int state, int old_state),
-            (oi, state, old_state))
+            (oi, state, old_state));
 
 #endif /* OSPF6_INTERFACE_H */

diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 7a1b96c2b3b8f7cb5f959be241b4d1938d7cc6b6..15065c98eb2fe7c1287f1f16691ec93ecbcf849a 100644 (file)
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -48,7 +48,7 @@
 
 DEFINE_HOOK(ospf6_neighbor_change,
            (struct ospf6_neighbor * on, int state, int next_state),
-           (on, state, next_state))
+           (on, state, next_state));
 
 unsigned char conf_debug_ospf6_neighbor = 0;
 

diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h
index 94300ff2bae24154a5aa1e732755e0aff3764913..f45b3405076aacd127a5de379794ca1c1d07956a 100644 (file)
--- a/ospf6d/ospf6_neighbor.h
+++ b/ospf6d/ospf6_neighbor.h
@@ -166,6 +166,6 @@ extern void install_element_ospf6_debug_neighbor(void);
 
 DECLARE_HOOK(ospf6_neighbor_change,
             (struct ospf6_neighbor * on, int state, int next_state),
-            (on, state, next_state))
+            (on, state, next_state));
 
 #endif /* OSPF6_NEIGHBOR_H */

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 51599ccc8a350f5a9ef5a779e2e90b3816b3252b..29de702e81526a8124f85c0bdb27479ab70909db 100644 (file)
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -50,10 +50,10 @@
 #include "ospfd/ospf_ldp_sync.h"
 
 DEFINE_QOBJ_TYPE(ospf_interface)
-DEFINE_HOOK(ospf_vl_add, (struct ospf_vl_data * vd), (vd))
-DEFINE_HOOK(ospf_vl_delete, (struct ospf_vl_data * vd), (vd))
-DEFINE_HOOK(ospf_if_update, (struct interface * ifp), (ifp))
-DEFINE_HOOK(ospf_if_delete, (struct interface * ifp), (ifp))
+DEFINE_HOOK(ospf_vl_add, (struct ospf_vl_data * vd), (vd));
+DEFINE_HOOK(ospf_vl_delete, (struct ospf_vl_data * vd), (vd));
+DEFINE_HOOK(ospf_if_update, (struct interface * ifp), (ifp));
+DEFINE_HOOK(ospf_if_delete, (struct interface * ifp), (ifp));
 
 int ospf_interface_neighbor_count(struct ospf_interface *oi)
 {

diff --git a/ospfd/ospf_interface.h b/ospfd/ospf_interface.h
index bf59af16c2cd2f063fd921d564f2b983ad9d20c3..bda98004b64e82c72dfe9c6ee3900927878a52af 100644 (file)
--- a/ospfd/ospf_interface.h
+++ b/ospfd/ospf_interface.h
@@ -329,10 +329,10 @@ extern void ospf_if_set_multicast(struct ospf_interface *);
 
 extern void ospf_if_interface(struct interface *ifp);
 
-DECLARE_HOOK(ospf_vl_add, (struct ospf_vl_data * vd), (vd))
-DECLARE_HOOK(ospf_vl_delete, (struct ospf_vl_data * vd), (vd))
+DECLARE_HOOK(ospf_vl_add, (struct ospf_vl_data * vd), (vd));
+DECLARE_HOOK(ospf_vl_delete, (struct ospf_vl_data * vd), (vd));
 
-DECLARE_HOOK(ospf_if_update, (struct interface * ifp), (ifp))
-DECLARE_HOOK(ospf_if_delete, (struct interface * ifp), (ifp))
+DECLARE_HOOK(ospf_if_update, (struct interface * ifp), (ifp));
+DECLARE_HOOK(ospf_if_delete, (struct interface * ifp), (ifp));
 
 #endif /* _ZEBRA_OSPF_INTERFACE_H */

diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index 36e97f877906de225d4369006fa559c5886e0e4d..1850d946b8691ec7bcf8a3b915536ecca66cffa2 100644 (file)
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -45,7 +45,7 @@
 
 DEFINE_HOOK(ospf_ism_change,
            (struct ospf_interface * oi, int state, int oldstate),
-           (oi, state, oldstate))
+           (oi, state, oldstate));
 
 /* elect DR and BDR. Refer to RFC2319 section 9.4 */
 static struct ospf_neighbor *ospf_dr_election_sub(struct list *routers)

diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h
index c41ba6c843e6e7f5cf068f43f71c23d0ede14d12..5d0f95aed1ab320d4afe60d3f58705a8e0727802 100644 (file)
--- a/ospfd/ospf_ism.h
+++ b/ospfd/ospf_ism.h
@@ -97,6 +97,6 @@ extern int ospf_dr_election(struct ospf_interface *oi);
 
 DECLARE_HOOK(ospf_ism_change,
             (struct ospf_interface * oi, int state, int oldstate),
-            (oi, state, oldstate))
+            (oi, state, oldstate));
 
 #endif /* _ZEBRA_OSPF_ISM_H */

diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 26e7855e8c86e910ca696154841e7e75744c3389..ca33fd4e1888cf1956ef2d68f38f8e296c3b63c0 100644 (file)
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -53,7 +53,7 @@
 
 DEFINE_HOOK(ospf_nsm_change,
            (struct ospf_neighbor * on, int state, int oldstate),
-           (on, state, oldstate))
+           (on, state, oldstate));
 
 static void nsm_clear_adj(struct ospf_neighbor *);
 

diff --git a/ospfd/ospf_nsm.h b/ospfd/ospf_nsm.h
index 24cf05009ce231b4caaba777c6988fa3f77450b4..e8573c6301a5b863ae129c4915b72b275c0002de 100644 (file)
--- a/ospfd/ospf_nsm.h
+++ b/ospfd/ospf_nsm.h
@@ -78,6 +78,6 @@ extern void ospf_db_summary_clear(struct ospf_neighbor *);
 extern int nsm_should_adj(struct ospf_neighbor *nbr);
 DECLARE_HOOK(ospf_nsm_change,
             (struct ospf_neighbor * on, int state, int oldstate),
-            (on, state, oldstate))
+            (on, state, oldstate));
 
 #endif /* _ZEBRA_OSPF_NSM_H */

diff --git a/pathd/pathd.c b/pathd/pathd.c
index 33e69e42d5154195d15bd1628a236d4e76620251..ef48c365b7d139cad1aa8237e5225a891519bc9c 100644 (file)
--- a/pathd/pathd.c
+++ b/pathd/pathd.c
@@ -35,11 +35,11 @@ DEFINE_MTYPE_STATIC(PATHD, PATH_SR_POLICY, "SR Policy");
 DEFINE_MTYPE_STATIC(PATHD, PATH_SR_CANDIDATE, "SR Policy candidate path");
 
 DEFINE_HOOK(pathd_candidate_created, (struct srte_candidate * candidate),
-           (candidate))
+           (candidate));
 DEFINE_HOOK(pathd_candidate_updated, (struct srte_candidate * candidate),
-           (candidate))
+           (candidate));
 DEFINE_HOOK(pathd_candidate_removed, (struct srte_candidate * candidate),
-           (candidate))
+           (candidate));
 
 static void trigger_pathd_candidate_created(struct srte_candidate *candidate);
 static int trigger_pathd_candidate_created_timer(struct thread *thread);

diff --git a/pathd/pathd.h b/pathd/pathd.h
index 4879239db88f1e2b71ec78736390170638a1fd67..e3d26a0ac5458165925bcf95db136078366b3b47 100644 (file)
--- a/pathd/pathd.h
+++ b/pathd/pathd.h
@@ -338,11 +338,11 @@ RB_HEAD(srte_policy_head, srte_policy);
 RB_PROTOTYPE(srte_policy_head, srte_policy, entry, srte_policy_compare)
 
 DECLARE_HOOK(pathd_candidate_created, (struct srte_candidate * candidate),
-            (candidate))
+            (candidate));
 DECLARE_HOOK(pathd_candidate_updated, (struct srte_candidate * candidate),
-            (candidate))
+            (candidate));
 DECLARE_HOOK(pathd_candidate_removed, (struct srte_candidate * candidate),
-            (candidate))
+            (candidate));
 
 extern struct srte_segment_list_head srte_segment_lists;
 extern struct srte_policy_head srte_policies;

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index c1cdf27bfb1461a66d0bb4edabf90841e30705e2..1ef64ff0def0112ddba918c7ecd3b699d7236db1 100644 (file)
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -45,8 +45,8 @@
 
 DEFINE_MTYPE_STATIC(RIPD, RIP_INTERFACE, "RIP interface");
 DEFINE_MTYPE(RIPD, RIP_INTERFACE_STRING, "RIP Interface String");
-DEFINE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc))
-DEFINE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc))
+DEFINE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc));
+DEFINE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc));
 
 /* static prototypes */
 static void rip_enable_apply(struct interface *);

diff --git a/ripd/ripd.h b/ripd/ripd.h
index 97806abc8944181e545a33b7e63a65ec4d823aec..85aac985f57adc7e8f3982d9dd1775d587d6fa3d 100644 (file)
--- a/ripd/ripd.h
+++ b/ripd/ripd.h
@@ -529,7 +529,7 @@ extern struct rip_instance_head rip_instances;
 /* Master thread strucutre. */
 extern struct thread_master *master;
 
-DECLARE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc))
-DECLARE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc))
+DECLARE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc));
+DECLARE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc));
 
 #endif /* _ZEBRA_RIP_H */

diff --git a/zebra/interface.c b/zebra/interface.c
index 9529f49d9b9d9fc388d941b9d7048604915f5738..c679e090cadfeba115d765a42fa6a1a61c6fa878 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -58,9 +58,9 @@ DEFINE_MTYPE_STATIC(ZEBRA, ZINFO, "Zebra Interface Information");
 #define ZEBRA_PTM_SUPPORT
 
 DEFINE_HOOK(zebra_if_extra_info, (struct vty * vty, struct interface *ifp),
-           (vty, ifp))
+           (vty, ifp));
 DEFINE_HOOK(zebra_if_config_wr, (struct vty * vty, struct interface *ifp),
-           (vty, ifp))
+           (vty, ifp));
 
 
 static void if_down_del_nbr_connected(struct interface *ifp);

diff --git a/zebra/interface.h b/zebra/interface.h
index 64569742b4573abba065122a0e723d443e7acbc2..67eb1176b9a2deec121ba1a261a5beb12897d3e1 100644 (file)
--- a/zebra/interface.h
+++ b/zebra/interface.h
@@ -417,9 +417,9 @@ struct zebra_if {
 };
 
 DECLARE_HOOK(zebra_if_extra_info, (struct vty * vty, struct interface *ifp),
-            (vty, ifp))
+            (vty, ifp));
 DECLARE_HOOK(zebra_if_config_wr, (struct vty * vty, struct interface *ifp),
-            (vty, ifp))
+            (vty, ifp));
 
 #define IS_ZEBRA_IF_VRF(ifp)                                                   \
        (((struct zebra_if *)(ifp->info))->zif_type == ZEBRA_IF_VRF)

diff --git a/zebra/rib.h b/zebra/rib.h
index 86766b8175730a338e2cad42f26f55321485d5d2..68b62f501b5f5831e25f9dbf8c627fde87c910aa 100644 (file)
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -541,7 +541,7 @@ static inline void rib_tables_iter_cleanup(rib_tables_iter_t *iter)
 }
 
 DECLARE_HOOK(rib_update, (struct route_node * rn, const char *reason),
-            (rn, reason))
+            (rn, reason));
 
 /*
  * Access installed/fib nexthops, which may be a subset of the

diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c
index fdf0d88151ba2964c905c9f340551d92c3ea4cc0..2e65307ea344da03d615694770f26761a9aefdaa 100644 (file)
--- a/zebra/zebra_mlag.c
+++ b/zebra/zebra_mlag.c
@@ -38,11 +38,11 @@
 #endif
 
 DEFINE_HOOK(zebra_mlag_private_write_data,
-           (uint8_t *data, uint32_t len), (data, len))
-DEFINE_HOOK(zebra_mlag_private_monitor_state, (), ())
-DEFINE_HOOK(zebra_mlag_private_open_channel, (), ())
-DEFINE_HOOK(zebra_mlag_private_close_channel, (), ())
-DEFINE_HOOK(zebra_mlag_private_cleanup_data, (), ())
+           (uint8_t *data, uint32_t len), (data, len));
+DEFINE_HOOK(zebra_mlag_private_monitor_state, (), ());
+DEFINE_HOOK(zebra_mlag_private_open_channel, (), ());
+DEFINE_HOOK(zebra_mlag_private_close_channel, (), ());
+DEFINE_HOOK(zebra_mlag_private_cleanup_data, (), ());
 
 #define ZEBRA_MLAG_METADATA_LEN 4
 #define ZEBRA_MLAG_MSG_BCAST 0xFFFFFFFF

diff --git a/zebra/zebra_mlag.h b/zebra/zebra_mlag.h
index b195c75ea3c1bcf183ed969671c89c55eb963ba2..eb96a57d3016499c123ecc01b7046c861c6efb9d 100644 (file)
--- a/zebra/zebra_mlag.h
+++ b/zebra/zebra_mlag.h
@@ -34,11 +34,11 @@ extern "C" {
 #define ZEBRA_MLAG_LEN_SIZE 4
 
 DECLARE_HOOK(zebra_mlag_private_write_data,
-            (uint8_t *data, uint32_t len), (data, len))
-DECLARE_HOOK(zebra_mlag_private_monitor_state, (), ())
-DECLARE_HOOK(zebra_mlag_private_open_channel, (), ())
-DECLARE_HOOK(zebra_mlag_private_close_channel, (), ())
-DECLARE_HOOK(zebra_mlag_private_cleanup_data, (), ())
+            (uint8_t *data, uint32_t len), (data, len));
+DECLARE_HOOK(zebra_mlag_private_monitor_state, (), ());
+DECLARE_HOOK(zebra_mlag_private_open_channel, (), ());
+DECLARE_HOOK(zebra_mlag_private_close_channel, (), ());
+DECLARE_HOOK(zebra_mlag_private_cleanup_data, (), ());
 
 extern uint8_t mlag_wr_buffer[ZEBRA_MLAG_BUF_LIMIT];
 extern uint8_t mlag_rd_buffer[ZEBRA_MLAG_BUF_LIMIT];

diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c
index 7ada407cfce3f8e75e65a9b1fcf2a3ec89713372..4b87432ffc178768d66037a440fa9e9e785f9dd3 100644 (file)
--- a/zebra/zebra_pbr.c
+++ b/zebra/zebra_pbr.c
@@ -128,12 +128,12 @@ static const struct message fragment_value_str[] = {
 DEFINE_HOOK(zebra_pbr_ipset_entry_get_stat,
            (struct zebra_pbr_ipset_entry *ipset, uint64_t *pkts,
             uint64_t *bytes),
-           (ipset, pkts, bytes))
+           (ipset, pkts, bytes));
 
 DEFINE_HOOK(zebra_pbr_iptable_get_stat,
            (struct zebra_pbr_iptable *iptable, uint64_t *pkts,
             uint64_t *bytes),
-           (iptable, pkts, bytes))
+           (iptable, pkts, bytes));
 
 DEFINE_HOOK(zebra_pbr_iptable_update,
            (int cmd, struct zebra_pbr_iptable *iptable), (cmd, iptable));

diff --git a/zebra/zebra_pbr.h b/zebra/zebra_pbr.h
index ef930336614b81e22014a8baab1df1584a452f25..2e9658e7e5083fc32f801bf7abbc5eceda3b6407 100644 (file)
--- a/zebra/zebra_pbr.h
+++ b/zebra/zebra_pbr.h
@@ -249,11 +249,11 @@ size_t zebra_pbr_tcpflags_snprintf(char *buffer, size_t len,
 DECLARE_HOOK(zebra_pbr_ipset_entry_get_stat,
             (struct zebra_pbr_ipset_entry *ipset, uint64_t *pkts,
              uint64_t *bytes),
-            (ipset, pkts, bytes))
+            (ipset, pkts, bytes));
 DECLARE_HOOK(zebra_pbr_iptable_get_stat,
             (struct zebra_pbr_iptable *iptable, uint64_t *pkts,
              uint64_t *bytes),
-            (iptable, pkts, bytes))
+            (iptable, pkts, bytes));
 DECLARE_HOOK(zebra_pbr_iptable_update,
             (int cmd, struct zebra_pbr_iptable *iptable), (cmd, iptable));
 

diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c
index c951fcfe73c9315c2b28e20b795e1527f6d5a313..c402f43265d054ac7adc0bac004d8e49d2cbe784 100644 (file)
--- a/zebra/zebra_pw.c
+++ b/zebra/zebra_pw.c
@@ -39,8 +39,8 @@ DEFINE_MTYPE_STATIC(LIB, PW, "Pseudowire");
 
 DEFINE_QOBJ_TYPE(zebra_pw)
 
-DEFINE_HOOK(pw_install, (struct zebra_pw * pw), (pw))
-DEFINE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw))
+DEFINE_HOOK(pw_install, (struct zebra_pw * pw), (pw));
+DEFINE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw));
 
 #define MPLS_NO_LABEL MPLS_INVALID_LABEL
 

diff --git a/zebra/zebra_pw.h b/zebra/zebra_pw.h
index 7b13c7e16b13631182549c6b76ba46ac2644ad2c..19f0f8181b8f86cd90335f5627aa9f351aa456b8 100644 (file)
--- a/zebra/zebra_pw.h
+++ b/zebra/zebra_pw.h
@@ -63,8 +63,8 @@ RB_PROTOTYPE(zebra_pw_head, zebra_pw, pw_entry, zebra_pw_compare);
 RB_HEAD(zebra_static_pw_head, zebra_pw);
 RB_PROTOTYPE(zebra_static_pw_head, zebra_pw, static_pw_entry, zebra_pw_compare);
 
-DECLARE_HOOK(pw_install, (struct zebra_pw * pw), (pw))
-DECLARE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw))
+DECLARE_HOOK(pw_install, (struct zebra_pw * pw), (pw));
+DECLARE_HOOK(pw_uninstall, (struct zebra_pw * pw), (pw));
 
 struct zebra_pw *zebra_pw_add(struct zebra_vrf *zvrf, const char *ifname,
                              uint8_t protocol, struct zserv *client);

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index bc3c68638d12ca84b90a804b932104118dc790d8..6b261927111e3e68fbcb6709ecbc39787d62779b 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -68,7 +68,7 @@ static struct thread *t_dplane;
 static struct dplane_ctx_q rib_dplane_q;
 
 DEFINE_HOOK(rib_update, (struct route_node * rn, const char *reason),
-           (rn, reason))
+           (rn, reason));
 
 /* Should we allow non Quagga processes to delete our routes */
 extern int allow_delete;

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index e5efbe0d4a65f204f02f6aa7b38f11e976a55dc4..d95967c55d5f29235e0600a5387ab07255e9138c 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -65,7 +65,7 @@ DEFINE_MTYPE_STATIC(ZEBRA, L3NEIGH, "EVPN Neighbor");
 DEFINE_MTYPE_STATIC(ZEBRA, ZVXLAN_SG, "zebra VxLAN multicast group");
 
 DEFINE_HOOK(zebra_rmac_update, (zebra_mac_t *rmac, zebra_l3vni_t *zl3vni,
-           bool delete, const char *reason), (rmac, zl3vni, delete, reason))
+           bool delete, const char *reason), (rmac, zl3vni, delete, reason));
 
 /* static function declarations */
 static void zevpn_print_neigh_hash_all_evpn(struct hash_bucket *bucket,

diff --git a/zebra/zebra_vxlan_private.h b/zebra/zebra_vxlan_private.h
index 4ec55542a7255ca0a2fd9c0b8e8edf2cc3fceb7a..0556c4adced13b03c1eb6f92425307772b9a974c 100644 (file)
--- a/zebra/zebra_vxlan_private.h
+++ b/zebra/zebra_vxlan_private.h
@@ -226,7 +226,7 @@ extern struct interface *zl3vni_map_to_mac_vlan_if(zebra_l3vni_t *zl3vni);
 extern zebra_l3vni_t *zl3vni_lookup(vni_t vni);
 
 DECLARE_HOOK(zebra_rmac_update, (zebra_mac_t *rmac, zebra_l3vni_t *zl3vni,
-            bool delete, const char *reason), (rmac, zl3vni, delete, reason))
+            bool delete, const char *reason), (rmac, zl3vni, delete, reason));
 
 
 #ifdef __cplusplus