summaryrefslogtreecommitdiffstats
path: root/babeld
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2020-03-27 12:35:23 +0100
committerDavid Lamparter <equinox@diac24.net>2020-07-14 10:37:25 +0200
commit3efd0893d01696b680325679077382992d4eb33f (patch)
treeaac81fef8b8f5194e8280092f625b3f7b58da73b /babeld
parenttools: add source code string mangler (diff)
downloadfrr-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 'babeld')
-rw-r--r--babeld/babel_interface.c9
-rw-r--r--babeld/message.c3
-rw-r--r--babeld/route.c12
3 files changed, 8 insertions, 16 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
index 772aec123..1702d9277 100644
--- a/babeld/babel_interface.c
+++ b/babeld/babel_interface.c
@@ -692,8 +692,7 @@ interface_recalculate(struct interface *ifp)
rc = resize_receive_buffer(mtu);
if(rc < 0)
- zlog_warn("couldn't resize "
- "receive buffer for interface %s (%d) (%d bytes).\n",
+ zlog_warn("couldn't resize receive buffer for interface %s (%d) (%d bytes).\n",
ifp->name, ifp->ifindex, mtu);
memset(&mreq, 0, sizeof(mreq));
@@ -896,8 +895,7 @@ static void
show_babel_neighbour_sub (struct vty *vty, struct neighbour *neigh)
{
vty_out (vty,
- "Neighbour %s dev %s reach %04x rxcost %d txcost %d "
- "rtt %s rttcost %d%s.\n",
+ "Neighbour %s dev %s reach %04x rxcost %d txcost %d rtt %s rttcost %d%s.\n",
format_address(neigh->address),
neigh->ifp->name,
neigh->reach,
@@ -988,8 +986,7 @@ show_babel_routes_sub(struct babel_route *route, struct vty *vty,
}
vty_out (vty,
- "%s metric %d refmetric %d id %s seqno %d%s age %d "
- "via %s neigh %s%s%s%s\n",
+ "%s metric %d refmetric %d id %s seqno %d%s age %d via %s neigh %s%s%s%s\n",
format_prefix(route->src->prefix, route->src->plen),
route_metric(route), route->refmetric,
format_eui64(route->src->id),
diff --git a/babeld/message.c b/babeld/message.c
index d88790824..c9a10cb1c 100644
--- a/babeld/message.c
+++ b/babeld/message.c
@@ -710,8 +710,7 @@ fill_rtt_message(struct interface *ifp)
DO_HTONL(babel_ifp->sendbuf + babel_ifp->buffered_hello + 10, time);
return 1;
} else {
- flog_err(EC_BABEL_PACKET, "No space left for timestamp sub-TLV "
- "(this shouldn't happen)");
+ flog_err(EC_BABEL_PACKET, "No space left for timestamp sub-TLV (this shouldn't happen)");
return -1;
}
}
diff --git a/babeld/route.c b/babeld/route.c
index ab104aa2b..0f6f6486f 100644
--- a/babeld/route.c
+++ b/babeld/route.c
@@ -399,16 +399,14 @@ install_route(struct babel_route *route)
return;
if(!route_feasible(route))
- flog_err(EC_BABEL_ROUTE, "WARNING: installing unfeasible route "
- "(this shouldn't happen).");
+ flog_err(EC_BABEL_ROUTE, "WARNING: installing unfeasible route (this shouldn't happen).");
i = find_route_slot(route->src->prefix, route->src->plen, NULL);
assert(i >= 0 && i < route_slots);
if(routes[i] != route && routes[i]->installed) {
flog_err(EC_BABEL_ROUTE,
- "WARNING: attempting to install duplicate route "
- "(this shouldn't happen).");
+ "WARNING: attempting to install duplicate route (this shouldn't happen).");
return;
}
@@ -465,8 +463,7 @@ switch_routes(struct babel_route *old, struct babel_route *new)
return;
if(!route_feasible(new))
- flog_err(EC_BABEL_ROUTE, "WARNING: switching to unfeasible route "
- "(this shouldn't happen).");
+ flog_err(EC_BABEL_ROUTE, "WARNING: switching to unfeasible route (this shouldn't happen).");
rc = kernel_route(ROUTE_MODIFY, old->src->prefix, old->src->plen,
old->nexthop, old->neigh->ifp->ifindex,
@@ -835,8 +832,7 @@ update_route(const unsigned char *router_id,
in a timely manner. If the source remains the same, we ignore
the update. */
if(!feasible && route->installed) {
- debugf(BABEL_DEBUG_COMMON,"Unfeasible update for installed route to %s "
- "(%s %d %d -> %s %d %d).",
+ debugf(BABEL_DEBUG_COMMON,"Unfeasible update for installed route to %s (%s %d %d -> %s %d %d).",
format_prefix(src->prefix, src->plen),
format_eui64(route->src->id),
route->seqno, route->refmetric,