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 --- isisd/isis_vty_fabricd.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'isisd/isis_vty_fabricd.c') diff --git a/isisd/isis_vty_fabricd.c b/isisd/isis_vty_fabricd.c index 09b8d28258..562881bbdb 100644 --- a/isisd/isis_vty_fabricd.c +++ b/isisd/isis_vty_fabricd.c @@ -136,8 +136,7 @@ static void lsp_print_flooding(struct vty *vty, struct isis_lsp *lsp) vty_out(vty, "%s ago)\n", buf); if (lsp->flooding_circuit_scoped) { - vty_out(vty, " Received as circuit-scoped LSP, so not " - "flooded.\n"); + vty_out(vty, " Received as circuit-scoped LSP, so not flooded.\n"); return; } @@ -437,8 +436,7 @@ isis_vty_lsp_gen_interval_set(struct vty *vty, int level, uint16_t interval) if (interval >= area->lsp_refresh[lvl - 1]) { vty_out(vty, - "LSP gen interval %us must be less than " - "the LSP refresh interval %us\n", + "LSP gen interval %us must be less than the LSP refresh interval %us\n", interval, area->lsp_refresh[lvl - 1]); return CMD_WARNING_CONFIG_FAILED; } @@ -488,15 +486,13 @@ isis_vty_lsp_refresh_set(struct vty *vty, int level, uint16_t interval) continue; if (interval <= area->lsp_gen_interval[lvl - 1]) { vty_out(vty, - "LSP refresh interval %us must be greater than " - "the configured LSP gen interval %us\n", + "LSP refresh interval %us must be greater than the configured LSP gen interval %us\n", interval, area->lsp_gen_interval[lvl - 1]); return CMD_WARNING_CONFIG_FAILED; } if (interval > (area->max_lsp_lifetime[lvl - 1] - 300)) { vty_out(vty, - "LSP refresh interval %us must be less than " - "the configured LSP lifetime %us less 300\n", + "LSP refresh interval %us must be less than the configured LSP lifetime %us less 300\n", interval, area->max_lsp_lifetime[lvl - 1]); return CMD_WARNING_CONFIG_FAILED; } @@ -546,20 +542,17 @@ isis_vty_max_lsp_lifetime_set(struct vty *vty, int level, uint16_t interval) if (refresh_interval < area->lsp_refresh[lvl - 1]) { vty_out(vty, - "Level %d Max LSP lifetime %us must be 300s greater than " - "the configured LSP refresh interval %us\n", + "Level %d Max LSP lifetime %us must be 300s greater than the configured LSP refresh interval %us\n", lvl, interval, area->lsp_refresh[lvl - 1]); vty_out(vty, - "Automatically reducing level %d LSP refresh interval " - "to %us\n", + "Automatically reducing level %d LSP refresh interval to %us\n", lvl, refresh_interval); set_refresh_interval[lvl - 1] = 1; if (refresh_interval <= area->lsp_gen_interval[lvl - 1]) { vty_out(vty, - "LSP refresh interval %us must be greater than " - "the configured LSP gen interval %us\n", + "LSP refresh interval %us must be greater than the configured LSP gen interval %us\n", refresh_interval, area->lsp_gen_interval[lvl - 1]); return CMD_WARNING_CONFIG_FAILED; @@ -845,8 +838,7 @@ DEFUN (isis_metric, if (circuit->area && circuit->area->oldmetric == 1 && met > MAX_NARROW_LINK_METRIC) { vty_out(vty, - "Invalid metric %d - should be <0-63> " - "when narrow metric type enabled\n", + "Invalid metric %d - should be <0-63> when narrow metric type enabled\n", met); return CMD_WARNING_CONFIG_FAILED; } @@ -855,8 +847,7 @@ DEFUN (isis_metric, if (circuit->area && circuit->area->newmetric == 1 && met > MAX_WIDE_LINK_METRIC) { vty_out(vty, - "Invalid metric %d - should be <0-16777215> " - "when wide metric type enabled\n", + "Invalid metric %d - should be <0-16777215> when wide metric type enabled\n", met); return CMD_WARNING_CONFIG_FAILED; } -- cgit v1.2.3