diff options
| author | David Lamparter <equinox@diac24.net> | 2020-03-27 12:35:23 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-07-14 10:37:25 +0200 |
| commit | 3efd0893d01696b680325679077382992d4eb33f (patch) | |
| tree | aac81fef8b8f5194e8280092f625b3f7b58da73b /bfdd | |
| parent | tools: add source code string mangler (diff) | |
| download | frr-3efd0893d01696b680325679077382992d4eb33f.tar.xz frr-3efd0893d01696b680325679077382992d4eb33f.zip | |
*: 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>
Diffstat (limited to 'bfdd')
| -rw-r--r-- | bfdd/bfd.c | 6 | ||||
| -rw-r--r-- | bfdd/bfdd_nb_config.c | 3 | ||||
| -rw-r--r-- | bfdd/ptm_adapter.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/bfdd/bfd.c b/bfdd/bfd.c index 7d6f4c143..c4ba47561 100644 --- a/bfdd/bfd.c +++ b/bfdd/bfd.c @@ -1693,8 +1693,7 @@ struct bfd_session *bfd_key_lookup(struct bfd_key key) inet_ntop(bs.key.family, &bs.key.local, addr_buf, sizeof(addr_buf)); zlog_debug( - " peer %s found, but ifp %s" - " and loc-addr %s ignored", + " peer %s found, but ifp %s and loc-addr %s ignored", peer_buf, key.ifname, addr_buf); } return bsp; @@ -1716,8 +1715,7 @@ struct bfd_session *bfd_key_lookup(struct bfd_key key) bsp = ctx.result; if (bglobal.debug_peer_event) zlog_debug( - " peer %s found, but ifp" - " and/or loc-addr params ignored", + " peer %s found, but ifp and/or loc-addr params ignored", peer_buf); } return bsp; diff --git a/bfdd/bfdd_nb_config.c b/bfdd/bfdd_nb_config.c index de11997d1..209dea138 100644 --- a/bfdd/bfdd_nb_config.c +++ b/bfdd/bfdd_nb_config.c @@ -85,8 +85,7 @@ static int bfd_session_create(enum nb_event event, const struct lyd_node *dnode, if (p.family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6) && strlen(ifname) == 0) { zlog_warn( - "%s: when using link-local you must specify " - "an interface.", + "%s: when using link-local you must specify an interface.", __func__); return NB_ERR_VALIDATION; } diff --git a/bfdd/ptm_adapter.c b/bfdd/ptm_adapter.c index 1a23a690e..8134807a1 100644 --- a/bfdd/ptm_adapter.c +++ b/bfdd/ptm_adapter.c @@ -152,8 +152,7 @@ static void _ptm_bfd_session_del(struct bfd_session *bs, uint8_t diag) */ if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG)) { zlog_err( - "ptm-del-session: [%s] session refcount is " - "zero but it was configured by CLI", + "ptm-del-session: [%s] session refcount is zero but it was configured by CLI", bs_to_string(bs)); } else { control_notify_config(BCM_NOTIFY_CONFIG_DELETE, bs); |