From 3efd0893d01696b680325679077382992d4eb33f Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 27 Mar 2020 12:35:23 +0100 Subject: *: 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) `_ and `Issue #1794 `_. Scripted commit, idempotent to running: ``` python3 tools/stringmangle.py --unwrap `git ls-files | egrep '\.[ch]$'` ``` Signed-off-by: David Lamparter --- bgpd/bgp_fsm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bgpd/bgp_fsm.c') diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index e78682a3b..e133cde6a 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -1553,8 +1553,7 @@ int bgp_start(struct peer *peer) if (BGP_PEER_START_SUPPRESSED(peer)) { if (bgp_debug_neighbor_events(peer)) flog_err(EC_BGP_FSM, - "%s [FSM] Trying to start suppressed peer" - " - this is never supposed to happen!", + "%s [FSM] Trying to start suppressed peer - this is never supposed to happen!", peer->host); if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN)) peer->last_reset = PEER_DOWN_USER_SHUTDOWN; @@ -2285,8 +2284,7 @@ int bgp_event_update(struct peer *peer, enum bgp_fsm_events event) if (!dyn_nbr && !passive_conn && peer->bgp) { flog_err( EC_BGP_FSM, - "%s [FSM] Failure handling event %s in state %s, " - "prior events %s, %s, fd %d", + "%s [FSM] Failure handling event %s in state %s, prior events %s, %s, fd %d", peer->host, bgp_event_str[peer->cur_event], lookup_msg(bgp_status_msg, peer->status, NULL), bgp_event_str[peer->last_event], -- cgit v1.2.3