*: un-split strings across lines

Remove mid-string line breaks, cf. workflow doc:

  .. [#tool_style_conflicts] For example, lines over 80 characters are allowed
     for text strings to make it possible to search the code for them: please
     see `Linux kernel style (breaking long lines and strings)
     <https://www.kernel.org/doc/html/v4.10/process/coding-style.html#breaking-long-lines-and-strings>`_
     and `Issue #1794 <https://github.com/FRRouting/frr/issues/1794>`_.

Scripted commit, idempotent to running:
```
python3 tools/stringmangle.py --unwrap `git ls-files | egrep '\.[ch]$'`
```

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

17 files changed, 164 insertions, 336 deletions

diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c
index eb3323997..3dbc47617 100644
--- a/ospfd/ospf_abr.c
+++ b/ospfd/ospf_abr.c
@@ -348,8 +348,7 @@ static int ospf_abr_nssa_am_elected(struct ospf_area *area)
 		if (IS_ROUTER_LSA_NT(rlsa)) {
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_abr_nssa_am_elected: "
-					"router %s asserts Nt",
+					"ospf_abr_nssa_am_elected: router %s asserts Nt",
 					inet_ntoa(lsa->data->id));
 			return 0;
 		}
@@ -391,15 +390,13 @@ static void ospf_abr_nssa_check_status(struct ospf *ospf)
 
 		if (IS_DEBUG_OSPF(nssa, NSSA))
 			zlog_debug(
-				"ospf_abr_nssa_check_status: "
-				"checking area %s",
+				"ospf_abr_nssa_check_status: checking area %s",
 				inet_ntoa(area->area_id));
 
 		if (!IS_OSPF_ABR(area->ospf)) {
 			if (IS_DEBUG_OSPF(nssa, NSSA))
 				zlog_debug(
-					"ospf_abr_nssa_check_status: "
-					"not ABR");
+					"ospf_abr_nssa_check_status: not ABR");
 			area->NSSATranslatorState =
 				OSPF_NSSA_TRANSLATE_DISABLED;
 		} else {
@@ -409,8 +406,7 @@ static void ospf_abr_nssa_check_status(struct ospf *ospf)
 				/* TODO: check previous state and flush? */
 				if (IS_DEBUG_OSPF(nssa, NSSA))
 					zlog_debug(
-						"ospf_abr_nssa_check_status: "
-						"never translate");
+						"ospf_abr_nssa_check_status: never translate");
 				area->NSSATranslatorState =
 					OSPF_NSSA_TRANSLATE_DISABLED;
 				break;
@@ -422,8 +418,7 @@ static void ospf_abr_nssa_check_status(struct ospf *ospf)
 				 */
 				if (IS_DEBUG_OSPF(nssa, NSSA))
 					zlog_debug(
-						"ospf_abr_nssa_check_status: "
-						"translate always");
+						"ospf_abr_nssa_check_status: translate always");
 				area->NSSATranslatorState =
 					OSPF_NSSA_TRANSLATE_ENABLED;
 				break;
@@ -435,15 +430,13 @@ static void ospf_abr_nssa_check_status(struct ospf *ospf)
 						OSPF_NSSA_TRANSLATE_ENABLED;
 					if (IS_DEBUG_OSPF(nssa, NSSA))
 						zlog_debug(
-							"ospf_abr_nssa_check_status: "
-							"elected translator");
+							"ospf_abr_nssa_check_status: elected translator");
 				} else {
 					area->NSSATranslatorState =
 						OSPF_NSSA_TRANSLATE_DISABLED;
 					if (IS_DEBUG_OSPF(nssa, NSSA))
 						zlog_debug(
-							"ospf_abr_nssa_check_status: "
-							"not elected");
+							"ospf_abr_nssa_check_status: not elected");
 				}
 				break;
 			}
@@ -639,8 +632,7 @@ static int ospf_abr_translate_nssa(struct ospf_area *area, struct ospf_lsa *lsa)
 	if (ext7->e[0].fwd_addr.s_addr == OSPF_DEFAULT_DESTINATION) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_abr_translate_nssa(): LSA Id %s, "
-				"Forward address is 0, NO Translation",
+				"ospf_abr_translate_nssa(): LSA Id %s, Forward address is 0, NO Translation",
 				inet_ntoa(lsa->data->id));
 		return 1;
 	}
@@ -652,8 +644,7 @@ static int ospf_abr_translate_nssa(struct ospf_area *area, struct ospf_lsa *lsa)
 	if (old) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_abr_translate_nssa(): "
-				"found old translated LSA Id %s, refreshing",
+				"ospf_abr_translate_nssa(): found old translated LSA Id %s, refreshing",
 				inet_ntoa(old->data->id));
 
 		/* refresh */
@@ -661,8 +652,7 @@ static int ospf_abr_translate_nssa(struct ospf_area *area, struct ospf_lsa *lsa)
 		if (!new) {
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_abr_translate_nssa(): "
-					"could not refresh translated LSA Id %s",
+					"ospf_abr_translate_nssa(): could not refresh translated LSA Id %s",
 					inet_ntoa(old->data->id));
 		}
 	} else {
@@ -673,8 +663,7 @@ static int ospf_abr_translate_nssa(struct ospf_area *area, struct ospf_lsa *lsa)
 		if (ospf_translated_nssa_originate(area->ospf, lsa) == NULL) {
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_abr_translate_nssa(): Could not translate "
-					"Type-7 for %s to Type-5",
+					"ospf_abr_translate_nssa(): Could not translate Type-7 for %s to Type-5",
 					inet_ntoa(lsa->data->id));
 			return 1;
 		}
@@ -719,8 +708,7 @@ void ospf_abr_announce_network_to_area(struct prefix_ipv4 *p, uint32_t cost,
 
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_announce_network_to_area(): "
-				"old metric: %d, new metric: %d",
+				"ospf_abr_announce_network_to_area(): old metric: %d, new metric: %d",
 				GET_METRIC(sl->metric), cost);
 
 		if ((GET_METRIC(sl->metric) == full_cost)
@@ -728,15 +716,13 @@ void ospf_abr_announce_network_to_area(struct prefix_ipv4 *p, uint32_t cost,
 			/* unchanged. simply reapprove it */
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network_to_area(): "
-					"old summary approved");
+					"ospf_abr_announce_network_to_area(): old summary approved");
 			SET_FLAG(old->flags, OSPF_LSA_APPROVED);
 		} else {
 			/* LSA is changed, refresh it */
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network_to_area(): "
-					"refreshing summary");
+					"ospf_abr_announce_network_to_area(): refreshing summary");
 			set_metric(old, full_cost);
 			lsa = ospf_lsa_refresh(area->ospf, old);
 
@@ -758,8 +744,7 @@ void ospf_abr_announce_network_to_area(struct prefix_ipv4 *p, uint32_t cost,
 	} else {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_announce_network_to_area(): "
-				"creating new summary");
+				"ospf_abr_announce_network_to_area(): creating new summary");
 		lsa = ospf_summary_lsa_originate(p, full_cost, area);
 		/* This will flood through area. */
 
@@ -776,8 +761,7 @@ void ospf_abr_announce_network_to_area(struct prefix_ipv4 *p, uint32_t cost,
 		SET_FLAG(lsa->flags, OSPF_LSA_APPROVED);
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_announce_network_to_area(): "
-				"flooding new version of summary");
+				"ospf_abr_announce_network_to_area(): flooding new version of summary");
 	}
 
 	if (IS_DEBUG_OSPF_EVENT)
@@ -875,8 +859,7 @@ static void ospf_abr_announce_network(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (!ospf_abr_should_accept(p, area)) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network(): "
-					"prefix %s/%d was denied by import-list",
+					"ospf_abr_announce_network(): prefix %s/%d was denied by import-list",
 					inet_ntoa(p->prefix), p->prefixlen);
 			continue;
 		}
@@ -884,8 +867,7 @@ static void ospf_abr_announce_network(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (!ospf_abr_plist_in_check(area, or, p)) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network(): "
-					"prefix %s/%d was denied by prefix-list",
+					"ospf_abr_announce_network(): prefix %s/%d was denied by prefix-list",
 					inet_ntoa(p->prefix), p->prefixlen);
 			continue;
 		}
@@ -894,8 +876,7 @@ static void ospf_abr_announce_network(struct ospf *ospf, struct prefix_ipv4 *p,
 		    && area->no_summary) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network(): "
-					"area %s is stub and no_summary",
+					"ospf_abr_announce_network(): area %s is stub and no_summary",
 					inet_ntoa(area->area_id));
 			continue;
 		}
@@ -903,8 +884,7 @@ static void ospf_abr_announce_network(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (or->path_type == OSPF_PATH_INTER_AREA) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network(): this is "
-					"inter-area route to %s/%d",
+					"ospf_abr_announce_network(): this is inter-area route to %s/%d",
 					inet_ntoa(p->prefix), p->prefixlen);
 
 			if (!OSPF_IS_AREA_BACKBONE(area))
@@ -915,8 +895,7 @@ static void ospf_abr_announce_network(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (or->path_type == OSPF_PATH_INTRA_AREA) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_network(): "
-					"this is intra-area route to %s/%d",
+					"ospf_abr_announce_network(): this is intra-area route to %s/%d",
 					inet_ntoa(p->prefix), p->prefixlen);
 			if ((range = ospf_area_range_match(or_area, p))
 			    && !ospf_area_is_transit(area))
@@ -976,8 +955,7 @@ static void ospf_abr_process_nssa_translates(struct ospf *ospf)
 
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_abr_process_nssa_translates(): "
-				"looking at area %s",
+				"ospf_abr_process_nssa_translates(): looking at area %s",
 				inet_ntoa(area->area_id));
 
 		LSDB_LOOP (NSSA_LSDB(area), rn, lsa)
@@ -1018,24 +996,21 @@ static void ospf_abr_process_network_rt(struct ospf *ospf,
 		if (or->path_type >= OSPF_PATH_TYPE1_EXTERNAL) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_process_network_rt(): "
-					"this is an External router, skipping");
+					"ospf_abr_process_network_rt(): this is an External router, skipping");
 			continue;
 		}
 
 		if (or->cost >= OSPF_LS_INFINITY) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_process_network_rt():"
-					" this route's cost is infinity, skipping");
+					"ospf_abr_process_network_rt(): this route's cost is infinity, skipping");
 			continue;
 		}
 
 		if (or->type == OSPF_DESTINATION_DISCARD) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_process_network_rt():"
-					" this is a discard entry, skipping");
+					"ospf_abr_process_network_rt(): this is a discard entry, skipping");
 			continue;
 		}
 
@@ -1065,8 +1040,7 @@ static void ospf_abr_process_network_rt(struct ospf *ospf,
 		    && !OSPF_IS_AREA_ID_BACKBONE(or->u.std.area_id)) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_process_network_rt():"
-					" this is route is not backbone one, skipping");
+					"ospf_abr_process_network_rt(): this is route is not backbone one, skipping");
 			continue;
 		}
 
@@ -1078,8 +1052,7 @@ static void ospf_abr_process_network_rt(struct ospf *ospf,
 			    or->path_type != OSPF_PATH_INTRA_AREA) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_process_network_rt(): ALT ABR: "
-						"No BB connection, skip not intra-area routes");
+						"ospf_abr_process_network_rt(): ALT ABR: No BB connection, skip not intra-area routes");
 				continue;
 			}
 
@@ -1112,8 +1085,7 @@ static void ospf_abr_announce_rtr_to_area(struct prefix_ipv4 *p, uint32_t cost,
 
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_announce_network_to_area(): "
-				"old metric: %d, new metric: %d",
+				"ospf_abr_announce_network_to_area(): old metric: %d, new metric: %d",
 				GET_METRIC(slsa->metric), cost);
 	}
 
@@ -1144,8 +1116,7 @@ static void ospf_abr_announce_rtr_to_area(struct prefix_ipv4 *p, uint32_t cost,
 
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_announce_rtr_to_area(): "
-				"flooding new version of summary");
+				"ospf_abr_announce_rtr_to_area(): flooding new version of summary");
 
 		/*
 		zlog_info ("ospf_abr_announce_rtr_to_area(): creating new
@@ -1185,8 +1156,7 @@ static void ospf_abr_announce_rtr(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (area->external_routing != OSPF_AREA_DEFAULT) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_rtr(): "
-					"area %s doesn't support external routing",
+					"ospf_abr_announce_rtr(): area %s doesn't support external routing",
 					inet_ntoa(area->area_id));
 			continue;
 		}
@@ -1194,8 +1164,7 @@ static void ospf_abr_announce_rtr(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (or->path_type == OSPF_PATH_INTER_AREA) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_rtr(): "
-					"this is inter-area route to %s",
+					"ospf_abr_announce_rtr(): this is inter-area route to %s",
 					inet_ntoa(p->prefix));
 			if (!OSPF_IS_AREA_BACKBONE(area))
 				ospf_abr_announce_rtr_to_area(p, or->cost,
@@ -1205,8 +1174,7 @@ static void ospf_abr_announce_rtr(struct ospf *ospf, struct prefix_ipv4 *p,
 		if (or->path_type == OSPF_PATH_INTRA_AREA) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_abr_announce_rtr(): "
-					"this is intra-area route to %s",
+					"ospf_abr_announce_rtr(): this is intra-area route to %s",
 					inet_ntoa(p->prefix));
 			ospf_abr_announce_rtr_to_area(p, or->cost, area);
 		}
@@ -1255,8 +1223,7 @@ static void ospf_abr_process_router_rt(struct ospf *ospf,
 			if (!CHECK_FLAG(or->u.std.flags, ROUTER_LSA_EXTERNAL)) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_process_router_rt(): "
-						"This is not an ASBR, skipping");
+						"ospf_abr_process_router_rt(): This is not an ASBR, skipping");
 				continue;
 			}
 
@@ -1272,8 +1239,7 @@ static void ospf_abr_process_router_rt(struct ospf *ospf,
 			if (or != best) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_process_router_rt(): "
-						"This route is not the best among possible, skipping");
+						"ospf_abr_process_router_rt(): This route is not the best among possible, skipping");
 				continue;
 			}
 
@@ -1283,16 +1249,14 @@ static void ospf_abr_process_router_rt(struct ospf *ospf,
 						     or->u.std.area_id)) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_process_router_rt(): "
-						"This route is not a backbone one, skipping");
+						"ospf_abr_process_router_rt(): This route is not a backbone one, skipping");
 				continue;
 			}
 
 			if (or->cost >= OSPF_LS_INFINITY) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_process_router_rt(): "
-						"This route has LS_INFINITY metric, skipping");
+						"ospf_abr_process_router_rt(): This route has LS_INFINITY metric, skipping");
 				continue;
 			}
 
@@ -1302,8 +1266,7 @@ static void ospf_abr_process_router_rt(struct ospf *ospf,
 				    or->path_type != OSPF_PATH_INTRA_AREA) {
 					if (IS_DEBUG_OSPF_EVENT)
 						zlog_debug(
-							"ospf_abr_process_network_rt(): ALT ABR: "
-							"No BB connection, skip not intra-area routes");
+							"ospf_abr_process_network_rt(): ALT ABR: No BB connection, skip not intra-area routes");
 					continue;
 				}
 
@@ -1333,8 +1296,7 @@ ospf_abr_unapprove_translates(struct ospf *ospf) /* For NSSA Translations */
 			UNSET_FLAG(lsa->flags, OSPF_LSA_APPROVED);
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_abr_unapprove_translates(): "
-					"approved unset on link id %s",
+					"ospf_abr_unapprove_translates(): approved unset on link id %s",
 					inet_ntoa(lsa->data->id));
 		}
 
@@ -1355,15 +1317,13 @@ static void ospf_abr_unapprove_summaries(struct ospf *ospf)
 	for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area)) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_unapprove_summaries(): "
-				"considering area %s",
+				"ospf_abr_unapprove_summaries(): considering area %s",
 				inet_ntoa(area->area_id));
 		LSDB_LOOP (SUMMARY_LSDB(area), rn, lsa)
 			if (ospf_lsa_is_self_originated(ospf, lsa)) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_unapprove_summaries(): "
-						"approved unset on summary link id %s",
+						"ospf_abr_unapprove_summaries(): approved unset on summary link id %s",
 						inet_ntoa(lsa->data->id));
 				UNSET_FLAG(lsa->flags, OSPF_LSA_APPROVED);
 			}
@@ -1372,8 +1332,7 @@ static void ospf_abr_unapprove_summaries(struct ospf *ospf)
 			if (ospf_lsa_is_self_originated(ospf, lsa)) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_unapprove_summaries(): "
-						"approved unset on asbr-summary link id %s",
+						"ospf_abr_unapprove_summaries(): approved unset on asbr-summary link id %s",
 						inet_ntoa(lsa->data->id));
 				UNSET_FLAG(lsa->flags, OSPF_LSA_APPROVED);
 			}
@@ -1428,8 +1387,7 @@ static void ospf_abr_announce_aggregates(struct ospf *ospf)
 						OSPF_AREA_RANGE_ADVERTISE)) {
 					if (IS_DEBUG_OSPF_EVENT)
 						zlog_debug(
-							"ospf_abr_announce_aggregates():"
-							" discarding suppress-ranges");
+							"ospf_abr_announce_aggregates(): discarding suppress-ranges");
 					continue;
 				}
 
@@ -1439,8 +1397,7 @@ static void ospf_abr_announce_aggregates(struct ospf *ospf)
 
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_abr_announce_aggregates():"
-						" this is range: %s/%d",
+						"ospf_abr_announce_aggregates(): this is range: %s/%d",
 						inet_ntoa(p.u.prefix4),
 						p.prefixlen);
 
@@ -1477,9 +1434,7 @@ static void ospf_abr_announce_aggregates(struct ospf *ospf)
 							       area)) {
 							if (IS_DEBUG_OSPF_EVENT)
 								zlog_debug(
-									"ospf_abr_announce_aggregates(): Skipping "
-									"announcement of BB aggregate into"
-									" a transit area");
+									"ospf_abr_announce_aggregates(): Skipping announcement of BB aggregate into a transit area");
 							continue;
 						}
 						ospf_abr_announce_network_to_area(
@@ -1526,8 +1481,7 @@ ospf_abr_send_nssa_aggregates(struct ospf *ospf) /* temporarily turned off */
 					OSPF_AREA_RANGE_ADVERTISE)) {
 				if (IS_DEBUG_OSPF_NSSA)
 					zlog_debug(
-						"ospf_abr_send_nssa_aggregates():"
-						" discarding suppress-ranges");
+						"ospf_abr_send_nssa_aggregates(): discarding suppress-ranges");
 				continue;
 			}
 
@@ -1537,8 +1491,7 @@ ospf_abr_send_nssa_aggregates(struct ospf *ospf) /* temporarily turned off */
 
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_abr_send_nssa_aggregates():"
-					" this is range: %s/%d",
+					"ospf_abr_send_nssa_aggregates(): this is range: %s/%d",
 					inet_ntoa(p.prefix), p.prefixlen);
 
 			if (CHECK_FLAG(range->flags,
@@ -1598,8 +1551,7 @@ static void ospf_abr_announce_stub_defaults(struct ospf *ospf)
 
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_announce_stub_defaults(): "
-				"announcing 0.0.0.0/0 to area %s",
+				"ospf_abr_announce_stub_defaults(): announcing 0.0.0.0/0 to area %s",
 				inet_ntoa(area->area_id));
 		ospf_abr_announce_network_to_area(&p, area->default_cost, area);
 	}
@@ -1614,8 +1566,7 @@ static int ospf_abr_remove_unapproved_translates_apply(struct ospf *ospf,
 	if (CHECK_FLAG(lsa->flags, OSPF_LSA_LOCAL_XLT)
 	    && !CHECK_FLAG(lsa->flags, OSPF_LSA_APPROVED)) {
 		zlog_info(
-			"ospf_abr_remove_unapproved_translates(): "
-			"removing unapproved translates, ID: %s",
+			"ospf_abr_remove_unapproved_translates(): removing unapproved translates, ID: %s",
 			inet_ntoa(lsa->data->id));
 
 		/* FLUSH THROUGHOUT AS */
@@ -1656,8 +1607,7 @@ static void ospf_abr_remove_unapproved_summaries(struct ospf *ospf)
 	for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area)) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_abr_remove_unapproved_summaries(): "
-				"looking at area %s",
+				"ospf_abr_remove_unapproved_summaries(): looking at area %s",
 				inet_ntoa(area->area_id));
 
 		LSDB_LOOP (SUMMARY_LSDB(area), rn, lsa)
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 49730063b..73ce60650 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -889,8 +889,7 @@ int ospf_apiserver_register_opaque_type(struct ospf_apiserver *apiserv,
 
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"API: Add LSA-type(%d)/Opaque-type(%d) into"
-			" apiserv(%p), total#(%d)",
+			"API: Add LSA-type(%d)/Opaque-type(%d) into apiserv(%p), total#(%d)",
 			lsa_type, opaque_type, (void *)apiserv,
 			listcount(apiserv->opaque_types));
 
@@ -920,8 +919,7 @@ int ospf_apiserver_unregister_opaque_type(struct ospf_apiserver *apiserv,
 
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"API: Del LSA-type(%d)/Opaque-type(%d)"
-					" from apiserv(%p), total#(%d)",
+					"API: Del LSA-type(%d)/Opaque-type(%d) from apiserv(%p), total#(%d)",
 					lsa_type, opaque_type, (void *)apiserv,
 					listcount(apiserv->opaque_types));
 
diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index 8747dd1f5..d2a30477b 100644
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -194,20 +194,17 @@ ospf_ase_calculate_asbr_route (struct ospf *ospf,
   if (al->e[0].fwd_addr.s_addr != 0)
     {
       if (IS_DEBUG_OSPF (lsa, LSA))
-	zlog_debug ("ospf_ase_calculate(): "
-		    "Forwarding address is not 0.0.0.0.");
+	zlog_debug ("ospf_ase_calculate(): Forwarding address is not 0.0.0.0.");
 
       if (! ospf_ase_forward_address_check (ospf, al->e[0].fwd_addr))
 	{
 	  if (IS_DEBUG_OSPF (lsa, LSA))
-	    zlog_debug ("ospf_ase_calculate(): "
-			"Forwarding address is one of our addresses, Ignore.");
+	    zlog_debug ("ospf_ase_calculate(): Forwarding address is one of our addresses, Ignore.");
 	  return NULL;
         }
 
       if (IS_DEBUG_OSPF (lsa, LSA))
-	zlog_debug ("ospf_ase_calculate(): "
-		    "Looking up in the Network Routing Table.");
+	zlog_debug ("ospf_ase_calculate(): Looking up in the Network Routing Table.");
 
       /* Looking up the path to the fwd_addr from Network route. */
       asbr.family = AF_INET;
@@ -219,8 +216,7 @@ ospf_ase_calculate_asbr_route (struct ospf *ospf,
       if (rn == NULL)
 	{
 	  if (IS_DEBUG_OSPF (lsa, LSA))
-	    zlog_debug ("ospf_ase_calculate(): "
-			"Couldn't find a route to the forwarding address.");
+	    zlog_debug ("ospf_ase_calculate(): Couldn't find a route to the forwarding address.");
 	  return NULL;
 	}
 
@@ -229,8 +225,7 @@ ospf_ase_calculate_asbr_route (struct ospf *ospf,
       if ((asbr_route = rn->info) == NULL)
 	{
 	  if (IS_DEBUG_OSPF (lsa, LSA))
-	    zlog_debug ("ospf_ase_calculate(): "
-			"Somehow OSPF route to ASBR is lost");
+	    zlog_debug ("ospf_ase_calculate(): Somehow OSPF route to ASBR is lost");
 	  return NULL;
 	}
     }
@@ -393,8 +388,7 @@ int ospf_ase_calculate_route(struct ospf *ospf, struct ospf_lsa *lsa)
 		if (!ospf_ase_forward_address_check(ospf, al->e[0].fwd_addr)) {
 			if (IS_DEBUG_OSPF(lsa, LSA))
 				zlog_debug(
-					"Route[External]: Forwarding address is our router "
-					"address");
+					"Route[External]: Forwarding address is our router address");
 			return 0;
 		}
 
@@ -407,8 +401,7 @@ int ospf_ase_calculate_route(struct ospf *ospf, struct ospf_lsa *lsa)
 		if (rn == NULL || (asbr_route = rn->info) == NULL) {
 			if (IS_DEBUG_OSPF(lsa, LSA))
 				zlog_debug(
-					"Route[External]: Can't find route to forwarding "
-					"address");
+					"Route[External]: Can't find route to forwarding address");
 			if (rn)
 				route_unlock_node(rn);
 			return 0;
diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c
index 86088a713..6dd5d78bd 100644
--- a/ospfd/ospf_ext.c
+++ b/ospfd/ospf_ext.c
@@ -491,8 +491,7 @@ uint32_t ospf_ext_schedule_prefix_index(struct interface *ifp, uint32_t index,
 		return rc;
 
 	if (p != NULL) {
-		osr_debug("EXT (%s): Schedule new prefix %pFX with index %u "
-			  "on interface %s", __func__, p, index, ifp->name);
+		osr_debug("EXT (%s): Schedule new prefix %pFX with index %u on interface %s", __func__, p, index, ifp->name);
 
 		/* Set first Extended Prefix then the Prefix SID information */
 		set_ext_prefix(exti, OSPF_PATH_INTRA_AREA, EXT_TLV_PREF_NFLG,
@@ -1006,8 +1005,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_new(struct ospf_area *area,
 	lsa_header_set(s, options, lsa_type, lsa_id, router_id);
 
 	osr_debug(
-		"EXT (%s): LSA[Type%u:%pI4]: Create an Opaque-LSA Extended "
-		"Prefix Opaque LSA instance",
+		"EXT (%s): LSA[Type%u:%pI4]: Create an Opaque-LSA Extended Prefix Opaque LSA instance",
 		__func__, lsa_type, &lsa_id);
 
 	/* Set opaque-LSA body fields. */
@@ -1064,8 +1062,7 @@ static struct ospf_lsa *ospf_ext_link_lsa_new(struct ospf_area *area,
 	lsa_id.s_addr = htonl(tmp);
 
 	osr_debug(
-		"EXT (%s) LSA[Type%u:%pI4]: Create an Opaque-LSA Extended "
-		"Link Opaque LSA instance",
+		"EXT (%s) LSA[Type%u:%pI4]: Create an Opaque-LSA Extended Link Opaque LSA instance",
 		__func__, lsa_type, &lsa_id);
 
 	/* Set opaque-LSA header fields. */
@@ -1130,8 +1127,7 @@ static int ospf_ext_pref_lsa_originate1(struct ospf_area *area,
 	ospf_flood_through_area(area, NULL /*nbr */, new);
 
 	osr_debug(
-		"EXT (%s): LSA[Type%u:%pI4]: Originate Opaque-LSA"
-		"Extended Prefix Opaque LSA: Area(%pI4), Link(%s)",
+		"EXT (%s): LSA[Type%u:%pI4]: Originate Opaque-LSAExtended Prefix Opaque LSA: Area(%pI4), Link(%s)",
 		__func__, new->data->type, &new->data->id,
 		&area->area_id, exti->ifp->name);
 	if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
@@ -1178,8 +1174,7 @@ static int ospf_ext_link_lsa_originate1(struct ospf_area *area,
 	ospf_flood_through_area(area, NULL /*nbr */, new);
 
 	osr_debug(
-		"EXT (%s): LSA[Type%u:%pI4]: Originate Opaque-LSA "
-		"Extended Link Opaque LSA: Area(%pI4), Link(%s)",
+		"EXT (%s): LSA[Type%u:%pI4]: Originate Opaque-LSA Extended Link Opaque LSA: Area(%pI4), Link(%s)",
 		__func__, new->data->type, &new->data->id,
 		&area->area_id, exti->ifp->name);
 	if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
@@ -1237,8 +1232,7 @@ static int ospf_ext_pref_lsa_originate(void *arg)
 
 		/* Ok, let's try to originate an LSA */
 		osr_debug(
-			"EXT (%s): Let's finally re-originate the LSA 7.0.0.%u "
-			"for Itf %s", __func__, exti->instance,
+			"EXT (%s): Let's finally re-originate the LSA 7.0.0.%u for Itf %s", __func__, exti->instance,
 			exti->ifp ? exti->ifp->name : "");
 		ospf_ext_pref_lsa_originate1(area, exti);
 	}
@@ -1300,8 +1294,7 @@ static int ospf_ext_link_lsa_originate(void *arg)
 
 		/* Ok, let's try to originate an LSA */
 		osr_debug(
-			"EXT (%s): Let's finally reoriginate the LSA 8.0.0.%u "
-			"for Itf %s through the Area %pI4", __func__,
+			"EXT (%s): Let's finally reoriginate the LSA 8.0.0.%u for Itf %s through the Area %pI4", __func__,
 			exti->instance,	exti->ifp ? exti->ifp->name : "-",
 			&area->area_id);
 		ospf_ext_link_lsa_originate1(area, exti);
@@ -1625,8 +1618,7 @@ static uint16_t show_vty_ext_link_rmt_itf_addr(struct vty *vty,
 	top = (struct ext_subtlv_rmt_itf_addr *)tlvh;
 
 	vty_out(vty,
-		"  Remote Interface Address Sub-TLV: Length %u\n	"
-		"Address: %s\n",
+		"  Remote Interface Address Sub-TLV: Length %u\n	Address: %s\n",
 		ntohs(top->header.length), inet_ntoa(top->value));
 
 	return TLV_SIZE(tlvh);
@@ -1639,8 +1631,7 @@ static uint16_t show_vty_ext_link_adj_sid(struct vty *vty,
 	struct ext_subtlv_adj_sid *top = (struct ext_subtlv_adj_sid *)tlvh;
 
 	vty_out(vty,
-		"  Adj-SID Sub-TLV: Length %u\n\tFlags: "
-		"0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\t%s: %u\n",
+		"  Adj-SID Sub-TLV: Length %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\t%s: %u\n",
 		ntohs(top->header.length), top->flags, top->mtid, top->weight,
 		CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label"
 								     : "Index",
@@ -1659,9 +1650,7 @@ static uint16_t show_vty_ext_link_lan_adj_sid(struct vty *vty,
 		(struct ext_subtlv_lan_adj_sid *)tlvh;
 
 	vty_out(vty,
-		"  LAN-Adj-SID Sub-TLV: Length %u\n\tFlags: "
-		"0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\tNeighbor ID: "
-		"%s\n\t%s: %u\n",
+		"  LAN-Adj-SID Sub-TLV: Length %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\tWeight: 0x%x\n\tNeighbor ID: %s\n\t%s: %u\n",
 		ntohs(top->header.length), top->flags, top->mtid, top->weight,
 		inet_ntoa(top->neighbor_id),
 		CHECK_FLAG(top->flags, EXT_SUBTLV_LINK_ADJ_SID_VFLG) ? "Label"
@@ -1749,8 +1738,7 @@ static uint16_t show_vty_ext_pref_pref_sid(struct vty *vty,
 		(struct ext_subtlv_prefix_sid *)tlvh;
 
 	vty_out(vty,
-		"  Prefix SID Sub-TLV: Length %u\n\tAlgorithm: "
-		"%u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\t%s: %u\n",
+		"  Prefix SID Sub-TLV: Length %u\n\tAlgorithm: %u\n\tFlags: 0x%x\n\tMT-ID:0x%x\n\t%s: %u\n",
 		ntohs(top->header.length), top->algorithm, top->flags,
 		top->mtid,
 		CHECK_FLAG(top->flags, EXT_SUBTLV_PREFIX_SID_VFLG) ? "Label"
diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 818e7e72b..58afb2b39 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -507,8 +507,7 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
 		if (NBR_IS_DR(inbr) || NBR_IS_BDR(inbr)) {
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_flood_through_interface(): "
-					"DR/BDR NOT SEND to int %s",
+					"ospf_flood_through_interface(): DR/BDR NOT SEND to int %s",
 					IF_NAME(oi));
 			return 1;
 		}
@@ -522,8 +521,7 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
 		if (oi->state == ISM_Backup) {
 			if (IS_DEBUG_OSPF_NSSA)
 				zlog_debug(
-					"ospf_flood_through_interface(): "
-					"ISM_Backup NOT SEND to int %s",
+					"ospf_flood_through_interface(): ISM_Backup NOT SEND to int %s",
 					IF_NAME(oi));
 			return 1;
 		}
@@ -538,8 +536,7 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
 	/* XXX HASSO: Is this IS_DEBUG_OSPF_NSSA really correct? */
 	if (IS_DEBUG_OSPF_NSSA)
 		zlog_debug(
-			"ospf_flood_through_interface(): "
-			"DR/BDR sending upd to int %s",
+			"ospf_flood_through_interface(): DR/BDR sending upd to int %s",
 			IF_NAME(oi));
 
 	/*  RFC2328  Section 13.3
diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c
index f1ba8a31e..87929e436 100644
--- a/ospfd/ospf_ia.c
+++ b/ospfd/ospf_ia.c
@@ -88,8 +88,7 @@ static void ospf_ia_network_route(struct ospf *ospf, struct route_table *rt,
 		if ((or = rn1->info)) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_ia_network_route(): "
-					"Found a route to the same network");
+					"ospf_ia_network_route(): Found a route to the same network");
 			/* Check the existing route. */
 			if ((res = ospf_route_cmp(ospf, new_or, or)) < 0) {
 				/* New route is better, so replace old one. */
@@ -151,8 +150,7 @@ static void ospf_ia_router_route(struct ospf *ospf, struct route_table *rtrs,
 	if (or) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_ia_router_route(): "
-				"a route to the same ABR through the same area exists");
+				"ospf_ia_router_route(): a route to the same ABR through the same area exists");
 		/* New route is better */
 		if ((ret = ospf_route_cmp(ospf, new_or, or)) < 0) {
 			listnode_delete(rn->info, or);
@@ -329,8 +327,7 @@ static void ospf_update_network_route(struct ospf *ospf, struct route_table *rt,
 				   backbone paths */
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_update_network_route(): "
-				"Allowing Shortcut ABR to add new route");
+				"ospf_update_network_route(): Allowing Shortcut ABR to add new route");
 		new_or = ospf_route_new();
 		new_or->type = OSPF_DESTINATION_NETWORK;
 		new_or->id = lsa->header.id;
@@ -367,8 +364,7 @@ static void ospf_update_network_route(struct ospf *ospf, struct route_table *rt,
 					     or->u.std.area_id)) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_update_network_route(): Shortcut: "
-					"this intra-area path is not backbone");
+					"ospf_update_network_route(): Shortcut: this intra-area path is not backbone");
 			return;
 		}
 	} else /* Not Shortcut ABR */
@@ -376,8 +372,7 @@ static void ospf_update_network_route(struct ospf *ospf, struct route_table *rt,
 		if (!OSPF_IS_AREA_ID_BACKBONE(or->u.std.area_id)) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_update_network_route(): "
-					"route is not BB-associated");
+					"ospf_update_network_route(): route is not BB-associated");
 			return; /* We can update only BB routes */
 		}
 	}
@@ -392,16 +387,14 @@ static void ospf_update_network_route(struct ospf *ospf, struct route_table *rt,
 	if (or->cost == cost) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_update_network_route(): "
-				"new route is same distance, adding nexthops");
+				"ospf_update_network_route(): new route is same distance, adding nexthops");
 		ospf_route_copy_nexthops(or, abr_or->paths);
 	}
 
 	if (or->cost > cost) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_update_network_route(): "
-				"new route is better, overriding nexthops");
+				"ospf_update_network_route(): new route is better, overriding nexthops");
 		ospf_route_subst_nexthops(or, abr_or->paths);
 		or->cost = cost;
 
@@ -649,8 +642,7 @@ void ospf_ia_routing(struct ospf *ospf, struct route_table *rt,
 				    */
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"ospf_ia_routing(): "
-						"Active BB connection not found");
+						"ospf_ia_routing(): Active BB connection not found");
 				for (ALL_LIST_ELEMENTS_RO(ospf->areas, node,
 							  area))
 					OSPF_EXAMINE_SUMMARIES_ALL(area, rt,
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 1622b2fd2..7977a2a9f 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -839,8 +839,7 @@ struct ospf_interface *ospf_vl_new(struct ospf *ospf,
 	if (vlink_count == OSPF_VL_MAX_COUNT) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_vl_new(): Alarm: "
-				"cannot create more than OSPF_MAX_VL_COUNT virtual links");
+				"ospf_vl_new(): Alarm: cannot create more than OSPF_MAX_VL_COUNT virtual links");
 		return NULL;
 	}
 
@@ -1118,8 +1117,7 @@ void ospf_vl_up_check(struct ospf_area *area, struct in_addr rid,
 			if (ospf_vl_set_params(vl_data, v)) {
 				if (IS_DEBUG_OSPF(ism, ISM_EVENTS))
 					zlog_debug(
-						"ospf_vl_up_check: VL cost change,"
-						" scheduling router lsa refresh");
+						"ospf_vl_up_check: VL cost change, scheduling router lsa refresh");
 				if (ospf->backbone)
 					ospf_router_lsa_update_area(
 						ospf->backbone);
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index d089ea76c..783e84814 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -525,8 +525,7 @@ static int lsa_link_broadcast_set(struct stream **s, struct ospf_interface *oi)
 	if (oi->state == ISM_Waiting) {
 		if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
 			zlog_debug(
-				"LSA[Type1]: Interface %s is in state Waiting. "
-				"Adding stub interface",
+				"LSA[Type1]: Interface %s is in state Waiting. Adding stub interface",
 				oi->ifp->name);
 		masklen2ip(oi->address->prefixlen, &mask);
 		id.s_addr = oi->address->u.prefix4.s_addr & mask.s_addr;
@@ -541,8 +540,7 @@ static int lsa_link_broadcast_set(struct stream **s, struct ospf_interface *oi)
 	    && ospf_nbr_count(oi, NSM_Full) > 0) {
 		if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
 			zlog_debug(
-				"LSA[Type1]: Interface %s has a DR. "
-				"Adding transit interface",
+				"LSA[Type1]: Interface %s has a DR. Adding transit interface",
 				oi->ifp->name);
 		return link_info_set(s, DR(oi), oi->address->u.prefix4,
 				     LSA_LINK_TYPE_TRANSIT, 0, cost);
@@ -551,8 +549,7 @@ static int lsa_link_broadcast_set(struct stream **s, struct ospf_interface *oi)
 	else {
 		if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
 			zlog_debug(
-				"LSA[Type1]: Interface %s has no DR. "
-				"Adding stub interface",
+				"LSA[Type1]: Interface %s has no DR. Adding stub interface",
 				oi->ifp->name);
 		masklen2ip(oi->address->prefixlen, &mask);
 		id.s_addr = oi->address->u.prefix4.s_addr & mask.s_addr;
@@ -1084,8 +1081,7 @@ static struct ospf_lsa *ospf_network_lsa_refresh(struct ospf_lsa *lsa)
 	if (oi == NULL) {
 		if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) {
 			zlog_debug(
-				"LSA[Type%d:%s]: network-LSA refresh: "
-				"no oi found, ick, ignoring.",
+				"LSA[Type%d:%s]: network-LSA refresh: no oi found, ick, ignoring.",
 				lsa->data->type, inet_ntoa(lsa->data->id));
 			ospf_lsa_header_dump(lsa->data);
 		}
@@ -1761,8 +1757,7 @@ static struct ospf_lsa *ospf_lsa_translated_nssa_new(struct ospf *ospf,
 	    == NULL) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_nssa_translate_originate(): Could not originate "
-				"Translated Type-5 for %s",
+				"ospf_nssa_translate_originate(): Could not originate Translated Type-5 for %s",
 				inet_ntoa(ei.p.prefix));
 		return NULL;
 	}
@@ -1796,8 +1791,7 @@ struct ospf_lsa *ospf_translated_nssa_originate(struct ospf *ospf,
 	if ((new = ospf_lsa_translated_nssa_new(ospf, type7)) == NULL) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_translated_nssa_originate(): Could not translate "
-				"Type-7, Id %s, to Type-5",
+				"ospf_translated_nssa_originate(): Could not translate Type-7, Id %s, to Type-5",
 				inet_ntoa(type7->data->id));
 		return NULL;
 	}
@@ -1806,8 +1800,7 @@ struct ospf_lsa *ospf_translated_nssa_originate(struct ospf *ospf,
 
 	if (IS_DEBUG_OSPF_NSSA) {
 		zlog_debug(
-			"ospf_translated_nssa_originate(): "
-			"translated Type 7, installed:");
+			"ospf_translated_nssa_originate(): translated Type 7, installed:");
 		ospf_lsa_header_dump(new->data);
 		zlog_debug("   Network mask: %d", ip_masklen(extnew->mask));
 		zlog_debug("   Forward addr: %s",
@@ -1816,9 +1809,7 @@ struct ospf_lsa *ospf_translated_nssa_originate(struct ospf *ospf,
 
 	if ((new = ospf_lsa_install(ospf, NULL, new)) == NULL) {
 		flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
-			  "ospf_lsa_translated_nssa_originate(): "
-			  "Could not install LSA "
-			  "id %s",
+			  "ospf_lsa_translated_nssa_originate(): Could not install LSA id %s",
 			  inet_ntoa(type7->data->id));
 		return NULL;
 	}
@@ -1885,8 +1876,7 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
 	if (!type7) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_translated_nssa_refresh(): no Type-7 found for "
-				"Type-5 LSA Id %s",
+				"ospf_translated_nssa_refresh(): no Type-7 found for Type-5 LSA Id %s",
 				inet_ntoa(type5->data->id));
 		return NULL;
 	}
@@ -1895,8 +1885,7 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
 	if (type5 == NULL || !CHECK_FLAG(type5->flags, OSPF_LSA_LOCAL_XLT)) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_translated_nssa_refresh(): No translated Type-5 "
-				"found for Type-7 with Id %s",
+				"ospf_translated_nssa_refresh(): No translated Type-5 found for Type-7 with Id %s",
 				inet_ntoa(type7->data->id));
 		return NULL;
 	}
@@ -1908,8 +1897,7 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
 	if ((new = ospf_lsa_translated_nssa_new(ospf, type7)) == NULL) {
 		if (IS_DEBUG_OSPF_NSSA)
 			zlog_debug(
-				"ospf_translated_nssa_refresh(): Could not translate "
-				"Type-7 for %s to Type-5",
+				"ospf_translated_nssa_refresh(): Could not translate Type-7 for %s to Type-5",
 				inet_ntoa(type7->data->id));
 		return NULL;
 	}
@@ -2269,8 +2257,7 @@ struct ospf_lsa *ospf_external_lsa_refresh(struct ospf *ospf,
 	if (!ospf_redistribute_check(ospf, ei, &changed)) {
 		if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
 			zlog_debug(
-				"LSA[Type%d:%s]: Could not be refreshed, "
-				"redist check fail",
+				"LSA[Type%d:%s]: Could not be refreshed, redist check fail",
 				lsa->data->type, inet_ntoa(lsa->data->id));
 		ospf_external_lsa_flush(ospf, ei->type, &ei->p,
 					ei->ifindex /*, ei->nexthop */);
@@ -2616,8 +2603,7 @@ struct ospf_lsa *ospf_lsa_install(struct ospf *ospf, struct ospf_interface *oi,
 
 			if (IS_DEBUG_OSPF(lsa, LSA_REFRESH)) {
 				zlog_debug(
-					"ospf_lsa_install() Premature Aging "
-					"lsa 0x%p, seqnum 0x%x",
+					"ospf_lsa_install() Premature Aging lsa 0x%p, seqnum 0x%x",
 					(void *)lsa,
 					ntohl(lsa->data->ls_seqnum));
 				ospf_lsa_header_dump(lsa->data);
@@ -2625,8 +2611,7 @@ struct ospf_lsa *ospf_lsa_install(struct ospf *ospf, struct ospf_interface *oi,
 		} else {
 			if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) {
 				zlog_debug(
-					"ospf_lsa_install() got an lsa with seq 0x80000000 "
-					"that was not self originated. Ignoring\n");
+					"ospf_lsa_install() got an lsa with seq 0x80000000 that was not self originated. Ignoring\n");
 				ospf_lsa_header_dump(lsa->data);
 			}
 			return old;
@@ -3368,8 +3353,7 @@ struct in_addr ospf_lsa_unique_id(struct ospf *ospf, struct ospf_lsdb *lsdb,
 		if (ip_masklen(al->mask) == p->prefixlen) {
 			if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
 				zlog_debug(
-					"ospf_lsa_unique_id(): "
-					"Can't get Link State ID for %s/%d",
+					"ospf_lsa_unique_id(): Can't get Link State ID for %s/%d",
 					inet_ntoa(p->prefix), p->prefixlen);
 			/*	  id.s_addr = 0; */
 			id.s_addr = 0xffffffff;
@@ -3386,8 +3370,7 @@ struct in_addr ospf_lsa_unique_id(struct ospf *ospf, struct ospf_lsdb *lsdb,
 			if (lsa) {
 				if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
 					zlog_debug(
-						"ospf_lsa_unique_id(): "
-						"Can't get Link State ID for %s/%d",
+						"ospf_lsa_unique_id(): Can't get Link State ID for %s/%d",
 						inet_ntoa(p->prefix),
 						p->prefixlen);
 				/* 	      id.s_addr = 0; */
@@ -3550,8 +3533,7 @@ void ospf_refresher_register_lsa(struct ospf *ospf, struct ospf_lsa *lsa)
 
 		if (IS_DEBUG_OSPF(lsa, LSA_REFRESH))
 			zlog_debug(
-				"LSA[Refresh:Type%d:%s]: ospf_refresher_register_lsa(): "
-				"setting refresh_list on lsa %p (slod %d)",
+				"LSA[Refresh:Type%d:%s]: ospf_refresher_register_lsa(): setting refresh_list on lsa %p (slod %d)",
 				lsa->data->type, inet_ntoa(lsa->data->id),
 				(void *)lsa, index);
 	}
@@ -3609,8 +3591,7 @@ int ospf_lsa_refresh_walker(struct thread *t)
 	     i = (i + 1) % OSPF_LSA_REFRESHER_SLOTS) {
 		if (IS_DEBUG_OSPF(lsa, LSA_REFRESH))
 			zlog_debug(
-				"LSA[Refresh]: ospf_lsa_refresh_walker(): "
-				"refresh index %d",
+				"LSA[Refresh]: ospf_lsa_refresh_walker(): refresh index %d",
 				i);
 
 		refresh_list = ospf->lsa_refresh_queue.qs[i];
@@ -3624,8 +3605,7 @@ int ospf_lsa_refresh_walker(struct thread *t)
 					       lsa)) {
 				if (IS_DEBUG_OSPF(lsa, LSA_REFRESH))
 					zlog_debug(
-						"LSA[Refresh:Type%d:%s]: ospf_lsa_refresh_walker(): "
-						"refresh lsa %p (slot %d)",
+						"LSA[Refresh:Type%d:%s]: ospf_lsa_refresh_walker(): refresh lsa %p (slot %d)",
 						lsa->data->type,
 						inet_ntoa(lsa->data->id),
 						(void *)lsa, i);
diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c
index b8e2dac70..3a1547978 100644
--- a/ospfd/ospf_network.c
+++ b/ospfd/ospf_network.c
@@ -53,9 +53,7 @@ int ospf_if_add_allspfrouters(struct ospf *top, struct prefix *p,
 	if (ret < 0)
 		flog_err(
 			EC_LIB_SOCKET,
-			"can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, "
-			"ifindex %u, AllSPFRouters): %s; perhaps a kernel limit "
-			"on # of multicast group memberships has been exceeded?",
+			"can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, ifindex %u, AllSPFRouters): %s; perhaps a kernel limit on # of multicast group memberships has been exceeded?",
 			top->fd, inet_ntoa(p->u.prefix4), ifindex,
 			safe_strerror(errno));
 	else {
@@ -78,8 +76,7 @@ int ospf_if_drop_allspfrouters(struct ospf *top, struct prefix *p,
 					ifindex);
 	if (ret < 0)
 		flog_err(EC_LIB_SOCKET,
-			 "can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, "
-			 "ifindex %u, AllSPFRouters): %s",
+			 "can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, ifindex %u, AllSPFRouters): %s",
 			 top->fd, inet_ntoa(p->u.prefix4), ifindex,
 			 safe_strerror(errno));
 	else {
@@ -104,9 +101,7 @@ int ospf_if_add_alldrouters(struct ospf *top, struct prefix *p,
 	if (ret < 0)
 		flog_err(
 			EC_LIB_SOCKET,
-			"can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, "
-			"ifindex %u, AllDRouters): %s; perhaps a kernel limit "
-			"on # of multicast group memberships has been exceeded?",
+			"can't setsockopt IP_ADD_MEMBERSHIP (fd %d, addr %s, ifindex %u, AllDRouters): %s; perhaps a kernel limit on # of multicast group memberships has been exceeded?",
 			top->fd, inet_ntoa(p->u.prefix4), ifindex,
 			safe_strerror(errno));
 	else
@@ -127,8 +122,7 @@ int ospf_if_drop_alldrouters(struct ospf *top, struct prefix *p,
 					ifindex);
 	if (ret < 0)
 		flog_err(EC_LIB_SOCKET,
-			 "can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, "
-			 "ifindex %u, AllDRouters): %s",
+			 "can't setsockopt IP_DROP_MEMBERSHIP (fd %d, addr %s, ifindex %u, AllDRouters): %s",
 			 top->fd, inet_ntoa(p->u.prefix4), ifindex,
 			 safe_strerror(errno));
 	else
@@ -167,8 +161,7 @@ int ospf_if_ipmulticast(struct ospf *top, struct prefix *p, ifindex_t ifindex)
 	ret = setsockopt_ipv4_multicast_if(top->fd, p->u.prefix4, ifindex);
 	if (ret < 0)
 		flog_err(EC_LIB_SOCKET,
-			 "can't setsockopt IP_MULTICAST_IF(fd %d, addr %s, "
-			 "ifindex %u): %s",
+			 "can't setsockopt IP_MULTICAST_IF(fd %d, addr %s, ifindex %u): %s",
 			 top->fd, inet_ntoa(p->u.prefix4), ifindex,
 			 safe_strerror(errno));
 #endif
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 47688babb..dffbfb7d1 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -683,8 +683,7 @@ static void nsm_change_state(struct ospf_neighbor *nbr, int state)
 
 		if (CHECK_FLAG(oi->ospf->config, OSPF_LOG_ADJACENCY_DETAIL))
 			zlog_info(
-				"%s:[%s:%s], %s -> %s): "
-				"scheduling new router-LSA origination",
+				"%s:[%s:%s], %s -> %s): scheduling new router-LSA origination",
 				__func__, inet_ntoa(nbr->router_id),
 				ospf_get_name(oi->ospf),
 				lookup_msg(ospf_nsm_state_msg, old_state, NULL),
@@ -785,8 +784,7 @@ int ospf_nsm_event(struct thread *thread)
 			 */
 			flog_err(
 				EC_OSPF_FSM_INVALID_STATE,
-				"NSM[%s:%s:%s]: %s (%s): "
-				"Warning: action tried to change next_state to %s",
+				"NSM[%s:%s:%s]: %s (%s): Warning: action tried to change next_state to %s",
 				IF_NAME(nbr->oi), inet_ntoa(nbr->router_id),
 				ospf_get_name(nbr->oi->ospf),
 				lookup_msg(ospf_nsm_state_msg, nbr->state,
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 35fa5da74..061ada5b1 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -1781,8 +1781,7 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
 	if (oipt->t_opaque_lsa_self != NULL) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"Type-%u Opaque-LSA has already scheduled to"
-				" RE-ORIGINATE: [opaque-type=%u]",
+				"Type-%u Opaque-LSA has already scheduled to RE-ORIGINATE: [opaque-type=%u]",
 				lsa_type,
 				GET_OPAQUE_TYPE(ntohl(lsa->data->id.s_addr)));
 		goto out;
@@ -1799,8 +1798,7 @@ void ospf_opaque_lsa_reoriginate_schedule(void *lsa_type_dependent,
 
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"Schedule Type-%u Opaque-LSA to RE-ORIGINATE in %d"
-			" ms later: [opaque-type=%u]",
+			"Schedule Type-%u Opaque-LSA to RE-ORIGINATE in %d ms later: [opaque-type=%u]",
 			lsa_type, delay,
 			GET_OPAQUE_TYPE(ntohl(lsa->data->id.s_addr)));
 
@@ -1919,8 +1917,7 @@ static int ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t)
 	if (n == 0 || !CHECK_FLAG(top->config, OSPF_OPAQUE_CAPABLE)) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"Suspend re-origination of Type-10 Opaque-LSAs"
-				" (opaque-type=%u) for a while...",
+				"Suspend re-origination of Type-10 Opaque-LSAs (opaque-type=%u) for a while...",
 				oipt->opaque_type);
 
 		oipt->status = PROC_SUSPEND;
@@ -1930,8 +1927,7 @@ static int ospf_opaque_type10_lsa_reoriginate_timer(struct thread *t)
 
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"Timer[Type10-LSA]: Re-originate Opaque-LSAs"
-			" (opaque-type=%u) for Area %s",
+			"Timer[Type10-LSA]: Re-originate Opaque-LSAs (opaque-type=%u) for Area %s",
 			oipt->opaque_type, inet_ntoa(area->area_id));
 
 	rc = (*functab->lsa_originator)(area);
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index a39d19cc5..b0dd5c6fc 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -604,8 +604,7 @@ static void ospf_write_frags(int fd, struct ospf_packet *op, struct ip *iph,
 		if (ret < 0)
 			flog_err(
 				EC_LIB_SOCKET,
-				"*** ospf_write_frags: sendmsg failed to %s,"
-				" id %d, off %d, len %d, mtu %u failed with %s",
+				"*** ospf_write_frags: sendmsg failed to %s, id %d, off %d, len %d, mtu %u failed with %s",
 				inet_ntoa(iph->ip_dst), iph->ip_id, iph->ip_off,
 				iph->ip_len, mtu, safe_strerror(errno));
 
@@ -798,16 +797,14 @@ static int ospf_write(struct thread *thread)
 		sockopt_iphdrincl_swab_systoh(&iph);
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_write to %s, "
-				"id %d, off %d, len %d, interface %s, mtu %u:",
+				"ospf_write to %s, id %d, off %d, len %d, interface %s, mtu %u:",
 				inet_ntoa(iph.ip_dst), iph.ip_id, iph.ip_off,
 				iph.ip_len, oi->ifp->name, oi->ifp->mtu);
 
 		if (ret < 0)
 			flog_err(
 				EC_LIB_SOCKET,
-				"*** sendmsg in ospf_write failed to %s, "
-				"id %d, off %d, len %d, interface %s, mtu %u: %s",
+				"*** sendmsg in ospf_write failed to %s, id %d, off %d, len %d, interface %s, mtu %u: %s",
 				inet_ntoa(iph.ip_dst), iph.ip_id, iph.ip_off,
 				iph.ip_len, oi->ifp->name, oi->ifp->mtu,
 				safe_strerror(errno));
@@ -897,8 +894,7 @@ static void ospf_hello(struct ip *iph, struct ospf_header *ospfh,
 	if (IPV4_ADDR_SAME(&ospfh->router_id, &oi->ospf->router_id)) {
 		if (IS_DEBUG_OSPF_PACKET(ospfh->type - 1, RECV)) {
 			zlog_debug(
-				"ospf_header[%s/%s]: selforiginated, "
-				"dropping.",
+				"ospf_header[%s/%s]: selforiginated, dropping.",
 				lookup_msg(ospf_packet_type_str, ospfh->type,
 					   NULL),
 				inet_ntoa(iph->ip_src));
@@ -927,8 +923,7 @@ static void ospf_hello(struct ip *iph, struct ospf_header *ospfh,
 	/* Compare Router Dead Interval. */
 	if (OSPF_IF_PARAM(oi, v_wait) != ntohl(hello->dead_interval)) {
 		flog_warn(EC_OSPF_PACKET,
-			  "Packet %s [Hello:RECV]: RouterDeadInterval mismatch "
-			  "(expected %u, but received %u).",
+			  "Packet %s [Hello:RECV]: RouterDeadInterval mismatch (expected %u, but received %u).",
 			  inet_ntoa(ospfh->router_id),
 			  OSPF_IF_PARAM(oi, v_wait),
 			  ntohl(hello->dead_interval));
@@ -941,8 +936,7 @@ static void ospf_hello(struct ip *iph, struct ospf_header *ospfh,
 		    != ntohs(hello->hello_interval)) {
 			flog_warn(
 				EC_OSPF_PACKET,
-				"Packet %s [Hello:RECV]: HelloInterval mismatch "
-				"(expected %u, but received %u).",
+				"Packet %s [Hello:RECV]: HelloInterval mismatch (expected %u, but received %u).",
 				inet_ntoa(ospfh->router_id),
 				OSPF_IF_PARAM(oi, v_hello),
 				ntohs(hello->hello_interval));
@@ -1213,8 +1207,7 @@ static void ospf_db_desc_proc(struct stream *s, struct ospf_interface *oi,
 			 */
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"Packet [DD:RECV]: LSA received Type %d, "
-					"ID %s is not recent.",
+					"Packet [DD:RECV]: LSA received Type %d, ID %s is not recent.",
 					lsah->type, inet_ntoa(lsah->id));
 			ospf_lsa_discard(new);
 		}
@@ -1402,8 +1395,7 @@ static void ospf_db_desc(struct ip *iph, struct ospf_header *ospfh,
 				if (CHECK_FLAG(oi->ospf->config,
 					       OSPF_LOG_ADJACENCY_DETAIL))
 					zlog_info(
-						"Packet[DD]: Neighbor %s: Initial DBD from Slave, "
-						"ignoring.",
+						"Packet[DD]: Neighbor %s: Initial DBD from Slave, ignoring.",
 						inet_ntoa(nbr->router_id));
 				break;
 			}
@@ -1527,8 +1519,7 @@ static void ospf_db_desc(struct ip *iph, struct ospf_header *ospfh,
 			if (IS_SET_DD_MS(nbr->dd_flags)) {
 				/* Master should discard duplicate DD packet. */
 				zlog_info(
-					"Packet[DD]: Neighbor %s duplicated, "
-					"packet discarded.",
+					"Packet[DD]: Neighbor %s duplicated, packet discarded.",
 					inet_ntoa(nbr->router_id));
 				break;
 			} else {
@@ -1848,8 +1839,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
 	if (nbr->state < NSM_Exchange) {
 		if (IS_DEBUG_OSPF(nsm, NSM_EVENTS))
 			zlog_debug(
-				"Link State Update: "
-				"Neighbor[%s] state %s is less than Exchange",
+				"Link State Update: Neighbor[%s] state %s is less than Exchange",
 				inet_ntoa(ospfh->router_id),
 				lookup_msg(ospf_nsm_state_msg, nbr->state,
 					   NULL));
@@ -1948,8 +1938,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
 				char buf3[INET_ADDRSTRLEN];
 
 				flog_err(EC_OSPF_ROUTER_LSA_MISMATCH,
-					 "Incoming Router-LSA from %s with "
-					 "Adv-ID[%s] != LS-ID[%s]",
+					 "Incoming Router-LSA from %s with Adv-ID[%s] != LS-ID[%s]",
 					 inet_ntop(AF_INET, &ospfh->router_id,
 						   buf1, INET_ADDRSTRLEN),
 					 inet_ntop(AF_INET, &lsa->data->id,
@@ -1959,8 +1948,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
 						   INET_ADDRSTRLEN));
 				flog_err(
 					EC_OSPF_DOMAIN_CORRUPT,
-					"OSPF domain compromised by attack or corruption. "
-					"Verify correct operation of -ALL- OSPF routers.");
+					"OSPF domain compromised by attack or corruption. Verify correct operation of -ALL- OSPF routers.");
 				DISCARD_LSA(lsa, 0);
 			}
 
@@ -2032,8 +2020,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
 			if (current == NULL) {
 				if (IS_DEBUG_OSPF_EVENT)
 					zlog_debug(
-						"LSA[%s]: Previously originated Opaque-LSA,"
-						"not found in the LSDB.",
+						"LSA[%s]: Previously originated Opaque-LSA,not found in the LSDB.",
 						dump_lsa_key(lsa));
 
 				SET_FLAG(lsa->flags, OSPF_LSA_SELF);
@@ -2254,8 +2241,7 @@ static void ospf_ls_ack(struct ip *iph, struct ospf_header *ospfh,
 	if (nbr->state < NSM_Exchange) {
 		if (IS_DEBUG_OSPF(nsm, NSM_EVENTS))
 			zlog_debug(
-				"Link State Acknowledgment: "
-				"Neighbor[%s] state %s is less than Exchange",
+				"Link State Acknowledgment: Neighbor[%s] state %s is less than Exchange",
 				inet_ntoa(ospfh->router_id),
 				lookup_msg(ospf_nsm_state_msg, nbr->state,
 					   NULL));
@@ -2322,8 +2308,7 @@ static struct stream *ospf_recv_packet(struct ospf *ospf, int fd,
 	if ((unsigned int)ret < sizeof(struct ip)) {
 		flog_warn(
 			EC_OSPF_PACKET,
-			"ospf_recv_packet: discarding runt packet of length %d "
-			"(ip header size is %u)",
+			"ospf_recv_packet: discarding runt packet of length %d (ip header size is %u)",
 			ret, (unsigned int)sizeof(iph));
 		return NULL;
 	}
@@ -2369,8 +2354,7 @@ static struct stream *ospf_recv_packet(struct ospf *ospf, int fd,
 	if (ret != ip_len) {
 		flog_warn(
 			EC_OSPF_PACKET,
-			"ospf_recv_packet read length mismatch: ip_len is %d, "
-			"but recvmsg returned %d",
+			"ospf_recv_packet read length mismatch: ip_len is %d, but recvmsg returned %d",
 			ip_len, ret);
 		return NULL;
 	}
@@ -3141,8 +3125,7 @@ static enum ospf_read_return_enum ospf_read_helper(struct ospf *ospf)
 	if (ret < 0) {
 		if (IS_DEBUG_OSPF_PACKET(0, RECV))
 			zlog_debug(
-				"ospf_read[%s]: Header check failed, "
-				"dropping.",
+				"ospf_read[%s]: Header check failed, dropping.",
 				inet_ntoa(iph->ip_src));
 		return OSPF_READ_CONTINUE;
 	}
@@ -3992,17 +3975,13 @@ static struct ospf_packet *ospf_ls_upd_packet_new(struct list *update,
 		if (!warned) {
 			flog_warn(
 				EC_OSPF_LARGE_LSA,
-				"ospf_ls_upd_packet_new: oversized LSA encountered!"
-				"will need to fragment. Not optimal. Try divide up"
-				" your network with areas. Use 'debug ospf packet send'"
-				" to see details, or look at 'show ip ospf database ..'");
+				"ospf_ls_upd_packet_new: oversized LSA encountered!will need to fragment. Not optimal. Try divide up your network with areas. Use 'debug ospf packet send' to see details, or look at 'show ip ospf database ..'");
 			warned = 1;
 		}
 
 		if (IS_DEBUG_OSPF_PACKET(0, SEND))
 			zlog_debug(
-				"ospf_ls_upd_packet_new: oversized LSA id:%s,"
-				" %d bytes originated by %s, will be fragmented!",
+				"ospf_ls_upd_packet_new: oversized LSA id:%s, %d bytes originated by %s, will be fragmented!",
 				inet_ntoa(lsa->data->id),
 				ntohs(lsa->data->length),
 				inet_ntoa(lsa->data->adv_router));
@@ -4020,9 +3999,7 @@ static struct ospf_packet *ospf_ls_upd_packet_new(struct list *update,
 
 	if (size > OSPF_MAX_PACKET_SIZE) {
 		flog_warn(EC_OSPF_LARGE_LSA,
-			  "ospf_ls_upd_packet_new: oversized LSA id:%s too big,"
-			  " %d bytes, packet size %ld, dropping it completely."
-			  " OSPF routing is broken!",
+			  "ospf_ls_upd_packet_new: oversized LSA id:%s too big, %d bytes, packet size %ld, dropping it completely. OSPF routing is broken!",
 			  inet_ntoa(lsa->data->id), ntohs(lsa->data->length),
 			  (long int)size);
 		list_delete_node(update, ln);
@@ -4153,8 +4130,7 @@ static int ospf_ls_upd_send_queue_event(struct thread *thread)
 	if (again != 0) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_ls_upd_send_queue: update lists not cleared,"
-				" %d nodes to try again, raising new event",
+				"ospf_ls_upd_send_queue: update lists not cleared, %d nodes to try again, raising new event",
 				again);
 		oi->t_ls_upd_event = NULL;
 		thread_add_event(master, ospf_ls_upd_send_queue_event, oi, 0,
diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c
index a661c80a9..776f50b33 100644
--- a/ospfd/ospf_route.c
+++ b/ospfd/ospf_route.c
@@ -322,8 +322,7 @@ void ospf_intra_add_router(struct route_table *rt, struct vertex *v,
 	if (!IS_ROUTER_LSA_BORDER(lsa) && !IS_ROUTER_LSA_EXTERNAL(lsa)) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_intra_add_router: "
-				"this router is neither ASBR nor ABR, skipping it");
+				"ospf_intra_add_router: this router is neither ASBR nor ABR, skipping it");
 		return;
 	}
 
@@ -506,8 +505,7 @@ void ospf_intra_add_stub(struct route_table *rt, struct router_lsa_link *link,
 
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_intra_add_stub(): "
-				"another route to the same prefix found with cost %u",
+				"ospf_intra_add_stub(): another route to the same prefix found with cost %u",
 				cur_or->cost);
 
 		/* Compare this distance to the current best cost to the stub
@@ -923,16 +921,14 @@ int ospf_add_discard_route(struct ospf *ospf, struct route_table *rt,
 		if (or->path_type == OSPF_PATH_INTRA_AREA) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_add_discard_route(): "
-					"an intra-area route exists");
+					"ospf_add_discard_route(): an intra-area route exists");
 			return 0;
 		}
 
 		if (or->type == OSPF_DESTINATION_DISCARD) {
 			if (IS_DEBUG_OSPF_EVENT)
 				zlog_debug(
-					"ospf_add_discard_route(): "
-					"discard entry already installed");
+					"ospf_add_discard_route(): discard entry already installed");
 			return 0;
 		}
 
@@ -941,8 +937,7 @@ int ospf_add_discard_route(struct ospf *ospf, struct route_table *rt,
 
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"ospf_add_discard_route(): "
-			"adding %s/%d",
+			"ospf_add_discard_route(): adding %s/%d",
 			inet_ntoa(p->prefix), p->prefixlen);
 
 	new_or = ospf_route_new();
@@ -967,8 +962,7 @@ void ospf_delete_discard_route(struct ospf *ospf, struct route_table *rt,
 
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"ospf_delete_discard_route(): "
-			"deleting %s/%d",
+			"ospf_delete_discard_route(): deleting %s/%d",
 			inet_ntoa(p->prefix), p->prefixlen);
 
 	rn = route_node_lookup(rt, (struct prefix *)p);
@@ -985,16 +979,14 @@ void ospf_delete_discard_route(struct ospf *ospf, struct route_table *rt,
 	if (or->path_type == OSPF_PATH_INTRA_AREA) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_delete_discard_route(): "
-				"an intra-area route exists");
+				"ospf_delete_discard_route(): an intra-area route exists");
 		return;
 	}
 
 	if (or->type != OSPF_DESTINATION_DISCARD) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_delete_discard_route(): "
-				"not a discard entry");
+				"ospf_delete_discard_route(): not a discard entry");
 		return;
 	}
 
diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index 64c59c9ab..91fc20475 100644
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -540,8 +540,7 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
 
 		if (IS_DEBUG_OSPF_EVENT) {
 			zlog_debug(
-				"%s: considering link:%s "
-				"type:%d link_id:%s link_data:%s",
+				"%s: considering link:%s type:%d link_id:%s link_data:%s",
 				__func__, oi->ifp->name, l->m[0].type,
 				inet_ntop(AF_INET, &l->link_id, buf1, BUFSIZ),
 				inet_ntop(AF_INET, &l->link_data, buf2,
@@ -676,8 +675,7 @@ static unsigned int ospf_nexthop_calculation(struct ospf_area *area,
 					return 1;
 				} else
 					zlog_info(
-						"ospf_nexthop_calculation(): "
-						"vl_data for VL link not found");
+						"ospf_nexthop_calculation(): vl_data for VL link not found");
 			} /* end virtual-link from V to W */
 			return 0;
 		} /* end W is a Router vertex */
@@ -1183,8 +1181,7 @@ static void ospf_spf_calculate(struct ospf *ospf, struct ospf_area *area,
 	if (!area->router_lsa_self) {
 		if (IS_DEBUG_OSPF_EVENT)
 			zlog_debug(
-				"ospf_spf_calculate: "
-				"Skip area %s's calculation due to empty router_lsa_self",
+				"ospf_spf_calculate: Skip area %s's calculation due to empty router_lsa_self",
 				inet_ntoa(area->area_id));
 		return;
 	}
diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index 1a65bfa41..8110bc2d0 100644
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -1022,8 +1022,7 @@ void ospf_sr_ri_lsa_update(struct ospf_lsa *lsa)
 	if ((srn != NULL) && (srn->instance != 0)
 	    && (srn->instance != ntohl(lsah->id.s_addr))) {
 		flog_err(EC_OSPF_SR_INVALID_LSA_ID,
-			 "SR (%s): Abort! Wrong "
-			 "LSA ID 4.0.0.%u for SR node %pI4/%u",
+			 "SR (%s): Abort! Wrong LSA ID 4.0.0.%u for SR node %pI4/%u",
 			 __func__, GET_OPAQUE_ID(ntohl(lsah->id.s_addr)),
 			 &lsah->adv_router, srn->instance);
 		return;
@@ -1638,8 +1637,7 @@ void ospf_sr_config_write_router(struct vty *vty)
 			for (ALL_LIST_ELEMENTS_RO(OspfSR.self->ext_prefix, node,
 						  srp)) {
 				vty_out(vty,
-					" segment-routing prefix %s/%u "
-					"index %u%s\n",
+					" segment-routing prefix %s/%u index %u%s\n",
 					inet_ntoa(srp->prefv4.prefix),
 					srp->prefv4.prefixlen, srp->sid,
 					CHECK_FLAG(srp->flags,
@@ -1665,8 +1663,7 @@ DEFUN(ospf_sr_enable,
 
 	if (ospf->vrf_id != VRF_DEFAULT) {
 		vty_out(vty,
-			"Segment Routing is only supported in default "
-			"VRF\n");
+			"Segment Routing is only supported in default VRF\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
@@ -1954,8 +1951,7 @@ DEFUN (sr_prefix_sid,
 		 */
 		listnode_add(OspfSR.self->ext_prefix, new);
 		zlog_info(
-			"Interface for prefix %pFX not found. Deferred LSA "
-			"flooding",
+			"Interface for prefix %pFX not found. Deferred LSA flooding",
 			&p);
 		return CMD_SUCCESS;
 	}
@@ -2245,11 +2241,9 @@ static void show_sr_node(struct vty *vty, struct json_object *json,
 
 	if (!json) {
 		sbuf_push(&sbuf, 0,
-			  "\n\n    Prefix or Link       Node or Adj. SID  "
-			  "     Label Operation  Interface          Nexthop\n");
+			  "\n\n    Prefix or Link       Node or Adj. SID       Label Operation  Interface          Nexthop\n");
 		sbuf_push(&sbuf, 0,
-			  "------------------  ---------------------  "
-			  "--------------------  ---------  ---------------\n");
+			  "------------------  ---------------------  --------------------  ---------  ---------------\n");
 	}
 	for (ALL_LIST_ELEMENTS_RO(srn->ext_prefix, node, srp)) {
 		if (json) {
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 4093837ba..c5557bc7a 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -313,8 +313,7 @@ DEFPY (ospf_router_id,
 	for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area))
 		if (area->full_nbrs) {
 			vty_out(vty,
-				"For this router-id change to take effect,"
-				" save config and restart ospfd\n");
+				"For this router-id change to take effect, save config and restart ospfd\n");
 			return CMD_SUCCESS;
 		}
 
@@ -347,8 +346,7 @@ DEFUN_HIDDEN (ospf_router_id_old,
 	for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area))
 		if (area->full_nbrs) {
 			vty_out(vty,
-				"For this router-id change to take effect,"
-				" save config and restart ospfd\n");
+				"For this router-id change to take effect, save config and restart ospfd\n");
 			return CMD_SUCCESS;
 		}
 
@@ -381,8 +379,7 @@ DEFPY (no_ospf_router_id,
 	for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area))
 		if (area->full_nbrs) {
 			vty_out(vty,
-				"For this router-id change to take effect,"
-				" save config and restart ospfd\n");
+				"For this router-id change to take effect, save config and restart ospfd\n");
 			return CMD_SUCCESS;
 		}
 
@@ -1385,8 +1382,7 @@ DEFUN (ospf_area_shortcut,
 
 	if (ospf->abr_type != OSPF_ABR_SHORTCUT)
 		vty_out(vty,
-			"Shortcut area setting will take effect "
-			"only when the router is configured as Shortcut ABR\n");
+			"Shortcut area setting will take effect only when the router is configured as Shortcut ABR\n");
 
 	return CMD_SUCCESS;
 }
@@ -1718,8 +1714,7 @@ DEFUN (ospf_area_default_cost,
 	p.prefixlen = 0;
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"ospf_abr_announce_stub_defaults(): "
-			"announcing 0.0.0.0/0 to area %s",
+			"ospf_abr_announce_stub_defaults(): announcing 0.0.0.0/0 to area %s",
 			inet_ntoa(area->area_id));
 	ospf_abr_announce_network_to_area(&p, area->default_cost, area);
 
@@ -1762,8 +1757,7 @@ DEFUN (no_ospf_area_default_cost,
 	p.prefixlen = 0;
 	if (IS_DEBUG_OSPF_EVENT)
 		zlog_debug(
-			"ospf_abr_announce_stub_defaults(): "
-			"announcing 0.0.0.0/0 to area %s",
+			"ospf_abr_announce_stub_defaults(): announcing 0.0.0.0/0 to area %s",
 			inet_ntoa(area->area_id));
 	ospf_abr_announce_network_to_area(&p, area->default_cost, area);
 
@@ -2712,8 +2706,7 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area,
 				    area->act_ints);
 	} else
 		vty_out(vty,
-			"   Number of interfaces in this area: Total: %d, "
-			"Active: %d\n",
+			"   Number of interfaces in this area: Total: %d, Active: %d\n",
 			listcount(area->oiflist), area->act_ints);
 
 	if (area->external_routing == OSPF_AREA_NSSA) {
@@ -2871,8 +2864,7 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area,
 	} else {
 		/* Show number of fully adjacent neighbors. */
 		vty_out(vty,
-			"   Number of fully adjacent neighbors in this area:"
-			" %d\n",
+			"   Number of fully adjacent neighbors in this area: %d\n",
 			area->full_nbrs);
 
 		/* Show authentication type. */
@@ -2886,8 +2878,7 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area,
 
 		if (!OSPF_IS_AREA_BACKBONE(area))
 			vty_out(vty,
-				"   Number of full virtual adjacencies going through"
-				" this area: %d\n",
+				"   Number of full virtual adjacencies going through this area: %d\n",
 				area->full_vls);
 
 		/* Show SPF calculation times. */
@@ -3173,8 +3164,7 @@ static int show_ip_ospf_common(struct vty *vty, struct ospf *ospf,
 				"injectingExternalRoutingInformation");
 		else
 			vty_out(vty,
-				" This router is an ASBR "
-				"(injecting external routing information)\n");
+				" This router is an ASBR (injecting external routing information)\n");
 	}
 
 	/* Show Number of AS-external-LSAs. */
@@ -10205,8 +10195,7 @@ static int config_write_virtual_link(struct vty *vty, struct ospf *ospf)
 					     ->auth_crypt,
 				     n2, ck))
 				vty_out(vty,
-					" area %s virtual-link %s"
-					" message-digest-key %d md5 %s\n",
+					" area %s virtual-link %s message-digest-key %d md5 %s\n",
 					buf, inet_ntoa(vl_data->vl_peer),
 					ck->key_id, ck->auth_key);
 		}
@@ -10385,8 +10374,7 @@ static int ospf_config_write_one(struct vty *vty, struct ospf *ospf)
 	/* auto-cost reference-bandwidth configuration.  */
 	if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH) {
 		vty_out(vty,
-			"! Important: ensure reference bandwidth "
-			"is consistent across all routers\n");
+			"! Important: ensure reference bandwidth is consistent across all routers\n");
 		vty_out(vty, " auto-cost reference-bandwidth %d\n",
 			ospf->ref_bandwidth);
 	}
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 644ea7f92..14b3550ec 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -770,8 +770,7 @@ static int ospf_external_lsa_originate_check(struct ospf *ospf,
 	/* If prefix is multicast, then do not originate LSA. */
 	if (IN_MULTICAST(htonl(ei->p.prefix.s_addr))) {
 		zlog_info(
-			"LSA[Type5:%s]: Not originate AS-external-LSA, "
-			"Prefix belongs multicast",
+			"LSA[Type5:%s]: Not originate AS-external-LSA, Prefix belongs multicast",
 			inet_ntoa(ei->p.prefix));
 		return 0;
 	}
@@ -780,8 +779,7 @@ static int ospf_external_lsa_originate_check(struct ospf *ospf,
 	if (is_prefix_default(&ei->p))
 		if (ospf->default_originate == DEFAULT_ORIGINATE_NONE) {
 			zlog_info(
-				"LSA[Type5:0.0.0.0]: Not originate AS-external-LSA "
-				"for default");
+				"LSA[Type5:0.0.0.0]: Not originate AS-external-LSA for default");
 			return 0;
 		}