diff options
| author | Mark Stapp <mjs@voltanet.io> | 2021-04-16 14:23:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 14:23:20 +0200 |
| commit | 861ea6f2682f0ed1f3f4ea4fbb70bdb09a2ca536 (patch) | |
| tree | 702ee2ba51664caeca828aa4d9d211b87accfe02 /lib | |
| parent | Merge pull request #8483 from opensourcerouting/asan-fix (diff) | |
| parent | python: add demo checker tool using frr.xref (diff) | |
| download | frr-861ea6f2682f0ed1f3f4ea4fbb70bdb09a2ca536.tar.xz frr-861ea6f2682f0ed1f3f4ea4fbb70bdb09a2ca536.zip | |
Merge pull request #8465 from opensourcerouting/vtysh-scan-snafu
fix vtysh_scan SNAFUs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/log_vty.c | 10 | ||||
| -rw-r--r-- | lib/subdir.am | 4 | ||||
| -rw-r--r-- | lib/thread.c | 26 |
3 files changed, 22 insertions, 18 deletions
diff --git a/lib/log_vty.c b/lib/log_vty.c index c26621ae9..c6788dd35 100644 --- a/lib/log_vty.c +++ b/lib/log_vty.c @@ -146,11 +146,11 @@ void log_show_syslog(struct vty *vty) zlog_progname); } -DEFUN (show_logging, - show_logging_cmd, - "show logging", - SHOW_STR - "Show current logging configuration\n") +DEFUN_NOSH (show_logging, + show_logging_cmd, + "show logging", + SHOW_STR + "Show current logging configuration\n") { log_show_syslog(vty); diff --git a/lib/subdir.am b/lib/subdir.am index 0853d4bb2..b7efec488 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -141,10 +141,14 @@ vtysh_scan += \ lib/if_rmap.c \ lib/keychain.c \ lib/lib_vty.c \ + lib/log_vty.c \ lib/nexthop_group.c \ lib/plist.c \ + lib/resolver.c \ lib/routemap.c \ lib/routemap_cli.c \ + lib/spf_backoff.c \ + lib/thread.c \ lib/vrf.c \ lib/vty.c \ # end diff --git a/lib/thread.c b/lib/thread.c index 567516300..3d8b54467 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -307,13 +307,13 @@ static uint8_t parse_filter(const char *filterstr) } #ifndef EXCLUDE_CPU_TIME -DEFUN (show_thread_cpu, - show_thread_cpu_cmd, - "show thread cpu [FILTER]", - SHOW_STR - "Thread information\n" - "Thread CPU usage\n" - "Display filter (rwtex)\n") +DEFUN_NOSH (show_thread_cpu, + show_thread_cpu_cmd, + "show thread cpu [FILTER]", + SHOW_STR + "Thread information\n" + "Thread CPU usage\n" + "Display filter (rwtex)\n") { uint8_t filter = (uint8_t)-1U; int idx = 0; @@ -374,12 +374,12 @@ static void show_thread_poll_helper(struct vty *vty, struct thread_master *m) } } -DEFUN (show_thread_poll, - show_thread_poll_cmd, - "show thread poll", - SHOW_STR - "Thread information\n" - "Show poll FD's and information\n") +DEFUN_NOSH (show_thread_poll, + show_thread_poll_cmd, + "show thread poll", + SHOW_STR + "Thread information\n" + "Show poll FD's and information\n") { struct listnode *node; struct thread_master *m; |