diff options
| author | Russ White <russ@riw.us> | 2017-07-14 14:00:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 14:00:43 +0200 |
| commit | 28bd1c1158c10268655878d12e5d8f17737de1bb (patch) | |
| tree | 576ef3527922cd2a0fec59fadf1cff947e8f2079 /tests | |
| parent | Merge pull request #762 from bingen/mutiple_nh_recursive_levels (diff) | |
| parent | lib, vtysh: remove now-useless newline arg (diff) | |
| download | frr-28bd1c1158c10268655878d12e5d8f17737de1bb.tar.xz frr-28bd1c1158c10268655878d12e5d8f17737de1bb.zip | |
Merge pull request #813 from opensourcerouting/newline-redux
newline redux
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/cli/common_cli.c | 4 | ||||
| -rw-r--r-- | tests/lib/cli/test_cli.c | 8 | ||||
| -rw-r--r-- | tests/lib/test_heavy.c | 4 | ||||
| -rw-r--r-- | tests/lib/test_heavy_thread.c | 2 | ||||
| -rw-r--r-- | tests/lib/test_heavy_wq.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index 728ae8cb0..f1b07ce22 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -36,10 +36,10 @@ int dump_args(struct vty *vty, const char *descr, int argc, struct cmd_token *argv[]) { int i; - vty_outln (vty, "%s with %d args.", descr, argc); + vty_out (vty, "%s with %d args.\n", descr, argc); for (i = 0; i < argc; i++) { - vty_outln (vty, "[%02d] %s@%s: %s", i, argv[i]->text, argv[i]->varname, argv[i]->arg); + vty_out (vty, "[%02d] %s@%s: %s\n", i, argv[i]->text, argv[i]->varname, argv[i]->arg); } return CMD_SUCCESS; diff --git a/tests/lib/cli/test_cli.c b/tests/lib/cli/test_cli.c index 43366d49e..a4d3fb4e8 100644 --- a/tests/lib/cli/test_cli.c +++ b/tests/lib/cli/test_cli.c @@ -47,10 +47,10 @@ DEFPY(magic_test, magic_test_cmd, "1\n2\n3\n4\n5\n") { char buf[256]; - vty_outln(vty, "def: %s", self->string); - vty_outln(vty, "num: %ld", magic); - vty_outln(vty, "ipv4: %s", prefix2str(ipv4net, buf, sizeof(buf))); - vty_outln(vty, "ipv6: %s", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf))); + vty_out(vty, "def: %s\n", self->string); + vty_out(vty, "num: %ld\n", magic); + vty_out(vty, "ipv4: %s\n", prefix2str(ipv4net, buf, sizeof(buf))); + vty_out(vty, "ipv6: %s\n", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf))); return CMD_SUCCESS; } diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c index 810d9fda7..c6f6bbba2 100644 --- a/tests/lib/test_heavy.c +++ b/tests/lib/test_heavy.c @@ -63,7 +63,7 @@ slow_func (struct vty *vty, const char *str, const int i) printf ("%s: hard error\n", __func__); if ((i % ITERS_PRINT) == 0) - printf ("%s did %d, x = %g%s", str, i, x, VTYNL); + printf ("%s did %d, x = %g\n", str, i, x); } static void @@ -88,7 +88,7 @@ DEFUN (clear_foo, char *str; if (!argc) { - vty_outln (vty, "%% string argument required"); + vty_out (vty, "%% string argument required\n"); return CMD_WARNING; } diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c index 80c54a827..9e1d70adc 100644 --- a/tests/lib/test_heavy_thread.c +++ b/tests/lib/test_heavy_thread.c @@ -112,7 +112,7 @@ DEFUN (clear_foo, if (!argc) { - vty_outln (vty, "%% string argument required"); + vty_out (vty, "%% string argument required\n"); return CMD_WARNING; } diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c index 13641f6ed..18b80d081 100644 --- a/tests/lib/test_heavy_wq.c +++ b/tests/lib/test_heavy_wq.c @@ -146,7 +146,7 @@ DEFUN (clear_foo, char *str; if (!argc) { - vty_outln (vty, "%% string argument required"); + vty_out (vty, "%% string argument required\n"); return CMD_WARNING; } |