diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c
index 087ae6467..acbccf9b4 100644
--- a/ospfd/ospf_asbr.c
+++ b/ospfd/ospf_asbr.c
@@ -174,7 +174,8 @@ void ospf_external_info_delete(struct ospf *ospf, uint8_t type,
  * The preserve_instance parameter may be used to prevent the current instance
  * from being deleted.
  */
-void ospf_external_info_delete_multi_instance(struct ospf *ospf, uint8_t type, struct prefix_ipv4 p,
+void ospf_external_info_delete_multi_instance(struct ospf *ospf, uint8_t type,
+					      struct prefix_ipv4 p,
 					      unsigned long preserve_instance)
 {
 	struct route_node *rn;
@@ -188,7 +189,8 @@ void ospf_external_info_delete_multi_instance(struct ospf *ospf, uint8_t type, s
 
 	for (ALL_LIST_ELEMENTS_RO(ext_list, node, ext)) {
 		if (ext->instance != preserve_instance) {
-			rn = route_node_lookup(EXTERNAL_INFO(ext), (struct prefix *)&p);
+			rn = route_node_lookup(EXTERNAL_INFO(ext),
+					       (struct prefix *)&p);
 			if (rn) {
 				ospf_external_info_free(rn->info);
 				rn->info = NULL;
@@ -249,7 +251,8 @@ struct external_info *ospf_external_info_default_lookup(struct ospf *ospf)
 			route_unlock_node(rn);
 			if (rn->info) {
 				ei = rn->info;
-				if (ei->type != ZEBRA_ROUTE_OSPF || ei->instance != ospf->instance)
+				if (ei->type != ZEBRA_ROUTE_OSPF ||
+				    ei->instance != ospf->instance)
 					return ei;
 			}
 		}
diff --git a/ospfd/ospf_asbr.h b/ospfd/ospf_asbr.h
index 8efdcc722..e41194dce 100644
--- a/ospfd/ospf_asbr.h
+++ b/ospfd/ospf_asbr.h
@@ -109,9 +109,10 @@ ospf_external_info_add(struct ospf *, uint8_t, unsigned short,
 		       route_tag_t, uint32_t metric);
 extern void ospf_external_info_delete(struct ospf *, uint8_t, unsigned short,
 				      struct prefix_ipv4);
-extern void ospf_external_info_delete_multi_instance(struct ospf *ospf, uint8_t type,
-						     struct prefix_ipv4 p,
-						     unsigned long preserve_instance);
+extern void
+ospf_external_info_delete_multi_instance(struct ospf *ospf, uint8_t type,
+					 struct prefix_ipv4 p,
+					 unsigned long preserve_instance);
 #define OSPF_DELETE_ANY_INSTANCE 0xffffffff
 extern struct external_info *ospf_external_info_lookup(struct ospf *, uint8_t,
 						       unsigned short,
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index bb584d8db..01122f43b 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -1305,8 +1305,8 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
 	 * originate)ZEBRA_ROUTE_MAX is used to delete the ex-info.
 	 * Resolved this inconsistency by maintaining same route type.
 	 */
-	if ((is_default_prefix(&pgen)) &&
-	    ((api.type != ZEBRA_ROUTE_OSPF) || (api.instance != ospf->instance)))
+	if ((is_default_prefix(&pgen)) && ((api.type != ZEBRA_ROUTE_OSPF) ||
+					   (api.instance != ospf->instance)))
 		rt_type = DEFAULT_ROUTE;
 
 	if (IS_DEBUG_OSPF(zebra, ZEBRA_REDISTRIBUTE))
@@ -1317,9 +1317,12 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
 			zebra_route_string(api.type), vrf_id, &api.prefix,
 			api.metric);
 =======
-		zlog_debug("%s: cmd %s from client %s-%d: vrf %s(%u), p %pFX, metric %d", __func__,
-			   zserv_command_string(cmd), zebra_route_string(api.type), api.instance,
-			   ospf_vrf_id_to_name(vrf_id), vrf_id, &api.prefix, api.metric);
+		zlog_debug(
+			"%s: cmd %s from client %s-%d: vrf %s(%u), p %pFX, metric %d",
+			__func__, zserv_command_string(cmd),
+			zebra_route_string(api.type), api.instance,
+			ospf_vrf_id_to_name(vrf_id), vrf_id, &api.prefix,
+			api.metric);
 >>>>>>> 6afd56da96 (ospfd: OSPF multi-instance default origination fixes)
 
 	if (cmd == ZEBRA_REDISTRIBUTE_ROUTE_ADD) {
@@ -1335,16 +1338,19 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
 			api.tag = ospf->dtag[rt_type];
 
 		/*
-		 * Given zebra sends an update for a prefix via an ADD message, it
-		 * will be considered as an impilict DELETE for that prefix for other
-		 * types and instances other than the type and instance associated with
-		 * the prefix.
+		 * Given zebra sends an update for a prefix via an ADD message,
+		 * it will be considered as an impilict DELETE for that prefix
+		 * for other types and instances other than the type and
+		 * instance associated with the prefix.
 		 */
 		for (i = 0; i <= ZEBRA_ROUTE_MAX; i++) {
 			unsigned long preserve_instance;
 
-			preserve_instance = (i == rt_type) ? api.instance : OSPF_DELETE_ANY_INSTANCE;
-			ospf_external_info_delete_multi_instance(ospf, i, p, preserve_instance);
+			preserve_instance = (i == rt_type)
+						    ? api.instance
+						    : OSPF_DELETE_ANY_INSTANCE;
+			ospf_external_info_delete_multi_instance(
+				ospf, i, p, preserve_instance);
 		}
 
 		ei = ospf_external_info_add(ospf, rt_type, api.instance, p,
diff --git a/ospfd/ospf_zebra.h b/ospfd/ospf_zebra.h
index b83524303..53b9fc43c 100644
--- a/ospfd/ospf_zebra.h
+++ b/ospfd/ospf_zebra.h
@@ -48,7 +48,8 @@ extern uint8_t ospf_distance_apply(struct ospf *ospf, struct prefix_ipv4 *,
 extern struct ospf_external *ospf_external_lookup(struct ospf *, uint8_t,
 						  unsigned short);
 
-extern struct external_info *ospf_external_info_default_lookup(struct ospf *ospf);
+extern struct external_info *
+ospf_external_info_default_lookup(struct ospf *ospf);
 
 extern struct ospf_external *ospf_external_add(struct ospf *, uint8_t,
 					       unsigned short);