polychaeta

diff --git a/tests/topotests/bgp_auth/test_bgp_auth.py b/tests/topotests/bgp_auth/test_bgp_auth.py
index f32bc49f5..fe0e56080 100644
--- a/tests/topotests/bgp_auth/test_bgp_auth.py
+++ b/tests/topotests/bgp_auth/test_bgp_auth.py
@@ -78,13 +78,13 @@ def reload_new_configs(tgen, *cflist):
     routers = tgen.routers()
     for rname, router in routers.items():
         destname = "{}/{}/{}".format(tgen.logdir, rname, FRRCFG_FILE)
-        wmode="w"
+        wmode = "w"

polychaeta

diff --git a/lib/hook.h b/lib/hook.h
index 3a0db6009..9fa730c73 100644
--- a/lib/hook.h
+++ b/lib/hook.h
@@ -218,7 +218,9 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
  */
 #define DEFINE_HOOK_INT(hookname, arglist, passlist, rev)                      \
 	struct hook _hook_##hookname = {                                       \
-		.name = #hookname, .entries = NULL, .reverse = rev,            \
+		.name = #hookname,                                             \

polychaeta

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index 0e92a1d73..28fd105a7 100644
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -32,7 +32,6 @@
 #include "debug.h"
 
 
-
 DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info");

polychaeta

diff --git a/lib/module.c b/lib/module.c
index 09ed27efa..4f057ebc8 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -95,7 +95,7 @@ struct frrmod_runtime *frrmod_load(const char *spec, const char *dir, char *err,
 			ssize_t used;                                          \
 			used = snprintfrr(pErr, err_remain,                    \
 					  "%sloader error: dlopen(%s): %s",    \
-					  ((pErr != err)? "\n": ""),           \
+					  ((pErr != err) ? "\n" : ""),         \

polychaeta

diff --git a/lib/module.c b/lib/module.c
index d7e41b547..4f057ebc8 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -94,9 +94,9 @@ struct frrmod_runtime *frrmod_load(const char *spec, const char *dir, char *err,
 		if (err && err_remain) {                                       \
 			ssize_t used;                                          \
 			used = snprintfrr(pErr, err_remain,                    \
-				          "%sloader error: dlopen(%s): %s",    \
-				          ((pErr != err)? "\n": ""),           \

polychaeta

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 6860f4d9d..017a5135e 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -680,7 +680,7 @@ struct thread_master *frr_init(void)
 	struct option_chain *oc;
 	struct frrmod_runtime *module;
 	struct zprivs_ids_t ids;
-	char moderr[7*PATH_MAX];
+	char moderr[7 * PATH_MAX];

polychaeta

diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index fd62a2fce..7aa71a33e 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -900,13 +900,12 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
 			continue;
 
 		frr_with_privs(&bgpd_privs) {
-			sock = vrf_socket(ainfo->ai_family,
-					  ainfo->ai_socktype,

polychaeta

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 90bc9e269..72c707150 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2244,9 +2244,10 @@ static void zread_router_id_add(ZAPI_HANDLER_ARGS)
 	 */
 	memset(&zero, 0, sizeof(zero));
 	if ((p.family == AF_INET && p.u.prefix4.s_addr == INADDR_ANY)
-	    || (p.family == AF_INET6 && memcmp(&p.u.prefix6,
-					       &zero.u.prefix6,

polychaeta

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index da7451c3e..cc1b2919c 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2965,11 +2965,11 @@ void ospf_check_and_gen_init_seq_lsa(struct ospf_interface *oi,
 
 	lsa = ospf_lsa_lookup_by_header(oi->area, recv_lsa->data);
 
-	if ((lsa == NULL)
-	|| (!CHECK_FLAG(lsa->flags, OSPF_LSA_PREMATURE_AGE))

polychaeta

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 5b303852a..52698402e 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1094,8 +1094,8 @@ static void ospf_hello(struct ip *iph, struct ospf_header *ospfh,
 		 * after GR. */
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
-			"%s, Neighbor is under GR Restart, hence ignoring the ISM Events",
-			__PRETTY_FUNCTION__);