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 /ldpd/hello.c | |
| parent | 93195af63f5cfcd0745524dc24561c277340a3bc (diff) | |
*: 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 'ldpd/hello.c')
| -rw-r--r-- | ldpd/hello.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ldpd/hello.c b/ldpd/hello.c index a8d6e58cda..ac24704bca 100644 --- a/ldpd/hello.c +++ b/ldpd/hello.c @@ -234,8 +234,7 @@ recv_hello(struct in_addr lsr_id, struct ldp_msg *msg, int af, * check)". */ if (flags & F_HELLO_TARGETED) { - log_debug("%s: lsr-id %s: invalid targeted hello " - "transport address %s", __func__, inet_ntoa(lsr_id), + log_debug("%s: lsr-id %s: invalid targeted hello transport address %s", __func__, inet_ntoa(lsr_id), log_addr(af, &trans_addr)); return; } @@ -250,8 +249,7 @@ recv_hello(struct in_addr lsr_id, struct ldp_msg *msg, int af, * targeted LDP Hello packet's source or destination addresses". */ if (af == AF_INET6 && IN6_IS_SCOPE_EMBED(&src->v6)) { - log_debug("%s: lsr-id %s: targeted hello with " - "link-local source address", __func__, + log_debug("%s: lsr-id %s: targeted hello with link-local source address", __func__, inet_ntoa(lsr_id)); return; } @@ -318,8 +316,7 @@ recv_hello(struct in_addr lsr_id, struct ldp_msg *msg, int af, * send a fatal Notification message with status code of * 'Transport Connection Mismatch' and reset the session". */ - log_debug("%s: lsr-id %s: remote transport preference does not " - "match the local preference", __func__, inet_ntoa(lsr_id)); + log_debug("%s: lsr-id %s: remote transport preference does not match the local preference", __func__, inet_ntoa(lsr_id)); if (nbr) session_shutdown(nbr, S_TRANS_MISMTCH, msg->id, msg->type); @@ -359,8 +356,7 @@ recv_hello(struct in_addr lsr_id, struct ldp_msg *msg, int af, if (nbr && nbr->af == af && (ldp_addrcmp(af, &nbr->raddr, &trans_addr) || nbr->raddr_scope != scope_id)) { - log_warnx("%s: lsr-id %s: hello packet advertising a different " - "transport address", __func__, inet_ntoa(lsr_id)); + log_warnx("%s: lsr-id %s: hello packet advertising a different transport address", __func__, inet_ntoa(lsr_id)); if (adj) adj_del(adj, S_SHUTDOWN); return; @@ -368,8 +364,7 @@ recv_hello(struct in_addr lsr_id, struct ldp_msg *msg, int af, if (nbr == NULL) { nbrt = nbr_find_addr(af, &trans_addr); if (nbrt) { - log_debug("%s: transport address %s is already being " - "used by lsr-id %s", __func__, log_addr(af, + log_debug("%s: transport address %s is already being used by lsr-id %s", __func__, log_addr(af, &trans_addr), inet_ntoa(nbrt->id)); if (adj) adj_del(adj, S_SHUTDOWN); |