Merge pull request #8121 from opensourcerouting/macro-cleanup

*: require ISO C11 + semicolons after file-scope macros

23 files changed, 95 insertions, 91 deletions

diff --git a/isisd/fabricd.c b/isisd/fabricd.c
index 57e9e91c1..426b96e90 100644
--- a/isisd/fabricd.c
+++ b/isisd/fabricd.c
@@ -33,9 +33,9 @@
 #include "isisd/isis_tx_queue.h"
 #include "isisd/isis_csm.h"
 
-DEFINE_MTYPE_STATIC(ISISD, FABRICD_STATE, "ISIS OpenFabric")
-DEFINE_MTYPE_STATIC(ISISD, FABRICD_NEIGHBOR, "ISIS OpenFabric Neighbor Entry")
-DEFINE_MTYPE_STATIC(ISISD, FABRICD_FLOODING_INFO, "ISIS OpenFabric Flooding Log")
+DEFINE_MTYPE_STATIC(ISISD, FABRICD_STATE, "ISIS OpenFabric");
+DEFINE_MTYPE_STATIC(ISISD, FABRICD_NEIGHBOR, "ISIS OpenFabric Neighbor Entry");
+DEFINE_MTYPE_STATIC(ISISD, FABRICD_FLOODING_INFO, "ISIS OpenFabric Flooding Log");
 
 /* Tracks initial synchronization as per section 2.4
  *
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index 744f5761c..a5482635e 100644
--- 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 b517a8e03..4daf7b5db 100644
--- 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_bfd.c b/isisd/isis_bfd.c
index 8386ada76..89f1ed0ba 100644
--- a/isisd/isis_bfd.c
+++ b/isisd/isis_bfd.c
@@ -32,7 +32,7 @@
 #include "isisd/isisd.h"
 #include "isisd/fabricd.h"
 
-DEFINE_MTYPE_STATIC(ISISD, BFD_SESSION, "ISIS BFD Session")
+DEFINE_MTYPE_STATIC(ISISD, BFD_SESSION, "ISIS BFD Session");
 
 struct bfd_session {
 	int family;
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 62822cbf8..6fc76fce4 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -61,9 +61,9 @@
 #include "isisd/isis_nb.h"
 #include "isisd/isis_ldp_sync.h"
 
-DEFINE_QOBJ_TYPE(isis_circuit)
+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 15d58bd73..cbe4040b6 100644
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -174,9 +174,9 @@ struct isis_circuit {
 				    */
 	struct list *snmp_adj_list; /* List in id order */
 
-	QOBJ_FIELDS
+	QOBJ_FIELDS;
 };
-DECLARE_QOBJ_TYPE(isis_circuit)
+DECLARE_QOBJ_TYPE(isis_circuit);
 
 void isis_circuit_init(void);
 struct isis_circuit *isis_circuit_new(struct isis *isis);
@@ -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_lfa.h b/isisd/isis_lfa.h
index 65891cae4..d75632e2c 100644
--- a/isisd/isis_lfa.h
+++ b/isisd/isis_lfa.h
@@ -23,8 +23,8 @@
 #include "lib/typesafe.h"
 #include "lib/zclient.h"
 
-PREDECL_RBTREE_UNIQ(lfa_tiebreaker_tree)
-PREDECL_RBTREE_UNIQ(rlfa_tree)
+PREDECL_RBTREE_UNIQ(lfa_tiebreaker_tree);
+PREDECL_RBTREE_UNIQ(rlfa_tree);
 
 enum lfa_tiebreaker_type {
 	LFA_TIEBREAKER_DOWNSTREAM = 0,
@@ -41,7 +41,7 @@ struct lfa_tiebreaker {
 int lfa_tiebreaker_cmp(const struct lfa_tiebreaker *a,
 		       const struct lfa_tiebreaker *b);
 DECLARE_RBTREE_UNIQ(lfa_tiebreaker_tree, struct lfa_tiebreaker, entry,
-		    lfa_tiebreaker_cmp)
+		    lfa_tiebreaker_cmp);
 
 struct rlfa {
 	struct rlfa_tree_item entry;
@@ -50,7 +50,7 @@ struct rlfa {
 	struct in_addr pq_address;
 };
 int rlfa_cmp(const struct rlfa *a, const struct rlfa *b);
-DECLARE_RBTREE_UNIQ(rlfa_tree, struct rlfa, entry, rlfa_cmp)
+DECLARE_RBTREE_UNIQ(rlfa_tree, struct rlfa, entry, rlfa_cmp);
 
 enum isis_tilfa_sid_type {
 	TILFA_SID_PREFIX = 1,
diff --git a/isisd/isis_lsp.h b/isisd/isis_lsp.h
index 896d95760..f3d9f61bc 100644
--- a/isisd/isis_lsp.h
+++ b/isisd/isis_lsp.h
@@ -27,7 +27,7 @@
 #include "lib/typesafe.h"
 #include "isisd/isis_pdu.h"
 
-PREDECL_RBTREE_UNIQ(lspdb)
+PREDECL_RBTREE_UNIQ(lspdb);
 
 struct isis;
 /* Structure for isis_lsp, this structure will only support the fixed
@@ -61,7 +61,7 @@ struct isis_lsp {
 };
 
 extern int lspdb_compare(const struct isis_lsp *a, const struct isis_lsp *b);
-DECLARE_RBTREE_UNIQ(lspdb, struct isis_lsp, dbe, lspdb_compare)
+DECLARE_RBTREE_UNIQ(lspdb, struct isis_lsp, dbe, lspdb_compare);
 
 void lsp_db_init(struct lspdb_head *head);
 void lsp_db_fini(struct lspdb_head *head);
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 1b04f4f7a..c03cedb18 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -193,7 +193,8 @@ FRR_DAEMON_INFO(isisd, ISIS, .vty_port = ISISD_VTY_PORT,
 		.n_signals = array_size(isisd_signals),
 
 		.privs = &isisd_privs, .yang_modules = isisd_yang_modules,
-		.n_yang_modules = array_size(isisd_yang_modules), )
+		.n_yang_modules = array_size(isisd_yang_modules),
+);
 
 /*
  * Main routine of isisd. Parse arguments and handle IS-IS state machine.
diff --git a/isisd/isis_memory.c b/isisd/isis_memory.c
index f716e060c..34f6b6089 100644
--- a/isisd/isis_memory.c
+++ b/isisd/isis_memory.c
@@ -25,25 +25,25 @@
 
 #include "isis_memory.h"
 
-DEFINE_MGROUP(ISISD, "isisd")
-DEFINE_MTYPE(ISISD, ISIS, "ISIS")
-DEFINE_MTYPE(ISISD, ISIS_TMP, "ISIS TMP")
-DEFINE_MTYPE(ISISD, ISIS_CIRCUIT, "ISIS circuit")
-DEFINE_MTYPE(ISISD, ISIS_LSP, "ISIS LSP")
-DEFINE_MTYPE(ISISD, ISIS_ADJACENCY, "ISIS adjacency")
-DEFINE_MTYPE(ISISD, ISIS_ADJACENCY_INFO, "ISIS adjacency info")
-DEFINE_MTYPE(ISISD, ISIS_AREA, "ISIS area")
-DEFINE_MTYPE(ISISD, ISIS_AREA_ADDR, "ISIS area address")
-DEFINE_MTYPE(ISISD, ISIS_DYNHN, "ISIS dyn hostname")
-DEFINE_MTYPE(ISISD, ISIS_SPFTREE, "ISIS SPFtree")
-DEFINE_MTYPE(ISISD, ISIS_VERTEX, "ISIS vertex")
-DEFINE_MTYPE(ISISD, ISIS_ROUTE_INFO, "ISIS route info")
-DEFINE_MTYPE(ISISD, ISIS_NEXTHOP, "ISIS nexthop")
-DEFINE_MTYPE(ISISD, ISIS_NEXTHOP_LABELS, "ISIS nexthop MPLS labels")
-DEFINE_MTYPE(ISISD, ISIS_DICT, "ISIS dictionary")
-DEFINE_MTYPE(ISISD, ISIS_DICT_NODE, "ISIS dictionary node")
-DEFINE_MTYPE(ISISD, ISIS_EXT_ROUTE, "ISIS redistributed route")
-DEFINE_MTYPE(ISISD, ISIS_EXT_INFO, "ISIS redistributed route info")
-DEFINE_MTYPE(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters")
-DEFINE_MTYPE(ISISD, ISIS_ACL_NAME, "ISIS access-list name")
-DEFINE_MTYPE(ISISD, ISIS_PLIST_NAME, "ISIS prefix-list name")
+DEFINE_MGROUP(ISISD, "isisd");
+DEFINE_MTYPE(ISISD, ISIS, "ISIS");
+DEFINE_MTYPE(ISISD, ISIS_TMP, "ISIS TMP");
+DEFINE_MTYPE(ISISD, ISIS_CIRCUIT, "ISIS circuit");
+DEFINE_MTYPE(ISISD, ISIS_LSP, "ISIS LSP");
+DEFINE_MTYPE(ISISD, ISIS_ADJACENCY, "ISIS adjacency");
+DEFINE_MTYPE(ISISD, ISIS_ADJACENCY_INFO, "ISIS adjacency info");
+DEFINE_MTYPE(ISISD, ISIS_AREA, "ISIS area");
+DEFINE_MTYPE(ISISD, ISIS_AREA_ADDR, "ISIS area address");
+DEFINE_MTYPE(ISISD, ISIS_DYNHN, "ISIS dyn hostname");
+DEFINE_MTYPE(ISISD, ISIS_SPFTREE, "ISIS SPFtree");
+DEFINE_MTYPE(ISISD, ISIS_VERTEX, "ISIS vertex");
+DEFINE_MTYPE(ISISD, ISIS_ROUTE_INFO, "ISIS route info");
+DEFINE_MTYPE(ISISD, ISIS_NEXTHOP, "ISIS nexthop");
+DEFINE_MTYPE(ISISD, ISIS_NEXTHOP_LABELS, "ISIS nexthop MPLS labels");
+DEFINE_MTYPE(ISISD, ISIS_DICT, "ISIS dictionary");
+DEFINE_MTYPE(ISISD, ISIS_DICT_NODE, "ISIS dictionary node");
+DEFINE_MTYPE(ISISD, ISIS_EXT_ROUTE, "ISIS redistributed route");
+DEFINE_MTYPE(ISISD, ISIS_EXT_INFO, "ISIS redistributed route info");
+DEFINE_MTYPE(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters");
+DEFINE_MTYPE(ISISD, ISIS_ACL_NAME, "ISIS access-list name");
+DEFINE_MTYPE(ISISD, ISIS_PLIST_NAME, "ISIS prefix-list name");
diff --git a/isisd/isis_memory.h b/isisd/isis_memory.h
index 5bcd2a398..5fd881e42 100644
--- a/isisd/isis_memory.h
+++ b/isisd/isis_memory.h
@@ -24,27 +24,27 @@
 
 #include "memory.h"
 
-DECLARE_MGROUP(ISISD)
-DECLARE_MTYPE(ISIS)
-DECLARE_MTYPE(ISIS_TMP)
-DECLARE_MTYPE(ISIS_CIRCUIT)
-DECLARE_MTYPE(ISIS_LSP)
-DECLARE_MTYPE(ISIS_ADJACENCY)
-DECLARE_MTYPE(ISIS_ADJACENCY_INFO)
-DECLARE_MTYPE(ISIS_AREA)
-DECLARE_MTYPE(ISIS_AREA_ADDR)
-DECLARE_MTYPE(ISIS_DYNHN)
-DECLARE_MTYPE(ISIS_SPFTREE)
-DECLARE_MTYPE(ISIS_VERTEX)
-DECLARE_MTYPE(ISIS_ROUTE_INFO)
-DECLARE_MTYPE(ISIS_NEXTHOP)
-DECLARE_MTYPE(ISIS_NEXTHOP_LABELS)
-DECLARE_MTYPE(ISIS_DICT)
-DECLARE_MTYPE(ISIS_DICT_NODE)
-DECLARE_MTYPE(ISIS_EXT_ROUTE)
-DECLARE_MTYPE(ISIS_EXT_INFO)
-DECLARE_MTYPE(ISIS_MPLS_TE)
-DECLARE_MTYPE(ISIS_ACL_NAME)
-DECLARE_MTYPE(ISIS_PLIST_NAME)
+DECLARE_MGROUP(ISISD);
+DECLARE_MTYPE(ISIS);
+DECLARE_MTYPE(ISIS_TMP);
+DECLARE_MTYPE(ISIS_CIRCUIT);
+DECLARE_MTYPE(ISIS_LSP);
+DECLARE_MTYPE(ISIS_ADJACENCY);
+DECLARE_MTYPE(ISIS_ADJACENCY_INFO);
+DECLARE_MTYPE(ISIS_AREA);
+DECLARE_MTYPE(ISIS_AREA_ADDR);
+DECLARE_MTYPE(ISIS_DYNHN);
+DECLARE_MTYPE(ISIS_SPFTREE);
+DECLARE_MTYPE(ISIS_VERTEX);
+DECLARE_MTYPE(ISIS_ROUTE_INFO);
+DECLARE_MTYPE(ISIS_NEXTHOP);
+DECLARE_MTYPE(ISIS_NEXTHOP_LABELS);
+DECLARE_MTYPE(ISIS_DICT);
+DECLARE_MTYPE(ISIS_DICT_NODE);
+DECLARE_MTYPE(ISIS_EXT_ROUTE);
+DECLARE_MTYPE(ISIS_EXT_INFO);
+DECLARE_MTYPE(ISIS_MPLS_TE);
+DECLARE_MTYPE(ISIS_ACL_NAME);
+DECLARE_MTYPE(ISIS_PLIST_NAME);
 
 #endif /* _QUAGGA_ISIS_MEMORY_H */
diff --git a/isisd/isis_mt.c b/isisd/isis_mt.c
index 9465c5e75..a6e236c79 100644
--- a/isisd/isis_mt.c
+++ b/isisd/isis_mt.c
@@ -29,9 +29,9 @@
 #include "isisd/isis_mt.h"
 #include "isisd/isis_tlvs.h"
 
-DEFINE_MTYPE_STATIC(ISISD, MT_AREA_SETTING, "ISIS MT Area Setting")
-DEFINE_MTYPE_STATIC(ISISD, MT_CIRCUIT_SETTING, "ISIS MT Circuit Setting")
-DEFINE_MTYPE_STATIC(ISISD, MT_ADJ_INFO, "ISIS MT Adjacency Info")
+DEFINE_MTYPE_STATIC(ISISD, MT_AREA_SETTING, "ISIS MT Area Setting");
+DEFINE_MTYPE_STATIC(ISISD, MT_CIRCUIT_SETTING, "ISIS MT Circuit Setting");
+DEFINE_MTYPE_STATIC(ISISD, MT_ADJ_INFO, "ISIS MT Adjacency Info");
 
 bool isis_area_ipv6_dstsrc_enabled(struct isis_area *area)
 {
diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index e1baf351f..ed5fadde1 100644
--- 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 d6763ec76..0e206d08f 100644
--- 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_snmp.c b/isisd/isis_snmp.c
index 50dc0f2a1..522026dde 100644
--- a/isisd/isis_snmp.c
+++ b/isisd/isis_snmp.c
@@ -3452,6 +3452,9 @@ static int isis_snmp_module_init(void)
 	return 0;
 }
 
-FRR_MODULE_SETUP(.name = "isis_snmp", .version = FRR_VERSION,
-		 .description = "isis AgentX SNMP module",
-		 .init = isis_snmp_module_init, )
+FRR_MODULE_SETUP(
+	.name = "isis_snmp",
+	.version = FRR_VERSION,
+	.description = "isis AgentX SNMP module",
+	.init = isis_snmp_module_init,
+);
diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c
index 21f534641..c4024772f 100644
--- a/isisd/isis_sr.c
+++ b/isisd/isis_sr.c
@@ -49,7 +49,7 @@
 #include "isisd/isis_errors.h"
 
 /* Local variables and functions */
-DEFINE_MTYPE_STATIC(ISISD, ISIS_SR_INFO, "ISIS segment routing information")
+DEFINE_MTYPE_STATIC(ISISD, ISIS_SR_INFO, "ISIS segment routing information");
 
 static void sr_local_block_delete(struct isis_area *area);
 static int sr_local_block_init(struct isis_area *area);
@@ -73,7 +73,7 @@ static inline int sr_prefix_sid_cfg_compare(const struct sr_prefix_cfg *a,
 	return prefix_cmp(&a->prefix, &b->prefix);
 }
 DECLARE_RBTREE_UNIQ(srdb_prefix_cfg, struct sr_prefix_cfg, entry,
-		    sr_prefix_sid_cfg_compare)
+		    sr_prefix_sid_cfg_compare);
 
 /**
  * Find SRGB associated to a System ID.
diff --git a/isisd/isis_sr.h b/isisd/isis_sr.h
index b012dfb00..a933f366e 100644
--- a/isisd/isis_sr.h
+++ b/isisd/isis_sr.h
@@ -57,7 +57,7 @@
 #define SRLB_UPPER_BOUND               15999
 
 /* Segment Routing Data Base (SRDB) RB-Tree structure */
-PREDECL_RBTREE_UNIQ(srdb_prefix_cfg)
+PREDECL_RBTREE_UNIQ(srdb_prefix_cfg);
 
 /*
  * Segment Routing Prefix-SID information.
diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c
index a97c19a8b..6af929046 100644
--- a/isisd/isis_tlvs.c
+++ b/isisd/isis_tlvs.c
@@ -45,9 +45,9 @@
 #include "isisd/isis_te.h"
 #include "isisd/isis_sr.h"
 
-DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS TLVs")
-DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs")
-DEFINE_MTYPE_STATIC(ISISD, ISIS_MT_ITEM_LIST, "ISIS MT Item Lists")
+DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS TLVs");
+DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs");
+DEFINE_MTYPE_STATIC(ISISD, ISIS_MT_ITEM_LIST, "ISIS MT Item Lists");
 
 typedef int (*unpack_tlv_func)(enum isis_tlv_context context, uint8_t tlv_type,
 			       uint8_t tlv_len, struct stream *s,
@@ -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/isis_tlvs.h b/isisd/isis_tlvs.h
index 037f91f0b..0438d13ae 100644
--- a/isisd/isis_tlvs.h
+++ b/isisd/isis_tlvs.h
@@ -28,7 +28,7 @@
 #include "openbsd-tree.h"
 #include "prefix.h"
 
-DECLARE_MTYPE(ISIS_SUBTLV)
+DECLARE_MTYPE(ISIS_SUBTLV);
 
 struct lspdb_head;
 struct isis_subtlvs;
diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c
index 5c87e3915..7db76db0d 100644
--- a/isisd/isis_tx_queue.c
+++ b/isisd/isis_tx_queue.c
@@ -32,8 +32,8 @@
 #include "isisd/isis_misc.h"
 #include "isisd/isis_tx_queue.h"
 
-DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE, "ISIS TX Queue")
-DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE_ENTRY, "ISIS TX Queue Entry")
+DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE, "ISIS TX Queue");
+DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE_ENTRY, "ISIS TX Queue Entry");
 
 struct isis_tx_queue {
 	struct isis_circuit *circuit;
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 487a902c0..039a8db27 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -81,7 +81,7 @@ unsigned long debug_sr;
 unsigned long debug_ldp_sync;
 unsigned long debug_lfa;
 
-DEFINE_QOBJ_TYPE(isis_area)
+DEFINE_QOBJ_TYPE(isis_area);
 
 /* ISIS process wide configuration. */
 static struct isis_master isis_master;
diff --git a/isisd/isisd.h b/isisd/isisd.h
index 1b0ec2b4f..ea716f998 100644
--- a/isisd/isisd.h
+++ b/isisd/isisd.h
@@ -236,11 +236,11 @@ struct isis_area {
 	uint64_t id_len_mismatches[2];
 	uint64_t lsp_error_counter[2];
 
-	QOBJ_FIELDS
+	QOBJ_FIELDS;
 };
-DECLARE_QOBJ_TYPE(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/isisd/subdir.am b/isisd/subdir.am
index 98674a688..61dc39bda 100644
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -142,7 +142,7 @@ nodist_isisd_isisd_SOURCES = \
 	# end
 
 isisd_isisd_snmp_la_SOURCES = isisd/isis_snmp.c
-isisd_isisd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS) -std=gnu99
+isisd_isisd_snmp_la_CFLAGS = $(WERROR) $(SNMP_CFLAGS) -std=gnu11
 isisd_isisd_snmp_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 isisd_isisd_snmp_la_LIBADD = lib/libfrrsnmp.la