diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2020-07-21 13:36:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:36:33 +0200 |
| commit | 97c8ca88082c45eaef0a51e35073b07df0cfe78d (patch) | |
| tree | eac8b05d66ae6de5403de4130c5d269bc1bbde64 | |
| parent | eae044661813ad1a68ac5bd99041bf7862fea27f (diff) | |
| parent | dc47ff5c3a8b593ab9d5e9e3aa68f62a7092561d (diff) | |
Merge pull request #6777 from idryzhov/vtysh-defpy
vtysh: rework DEFPY processing in extract.pl
| -rw-r--r-- | lib/command.h | 12 | ||||
| -rwxr-xr-x | vtysh/extract.pl.in | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/lib/command.h b/lib/command.h index 21bb613540..1acca90665 100644 --- a/lib/command.h +++ b/lib/command.h @@ -328,18 +328,6 @@ struct cmd_node { DEFUN_CMD_ELEMENT(funcname, cmdname, cmdstr, helpstr, \ CMD_ATTR_DEPRECATED, daemon) -#else /* VTYSH_EXTRACT_PL */ -#define DEFPY(funcname, cmdname, cmdstr, helpstr) \ - DEFUN(funcname, cmdname, cmdstr, helpstr) - -#define DEFPY_NOSH(funcname, cmdname, cmdstr, helpstr) \ - DEFUN_NOSH(funcname, cmdname, cmdstr, helpstr) - -#define DEFPY_ATTR(funcname, cmdname, cmdstr, helpstr, attr) \ - DEFUN_ATTR(funcname, cmdname, cmdstr, helpstr, attr) - -#define DEFPY_HIDDEN(funcname, cmdname, cmdstr, helpstr) \ - DEFUN_HIDDEN(funcname, cmdname, cmdstr, helpstr) #endif /* VTYSH_EXTRACT_PL */ /* Some macroes */ diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 7b81ced92e..346061d7ca 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -48,7 +48,7 @@ sub scan_file { } # ?: makes a group non-capturing - @defun = ($line =~ /((?:DEFUN|DEFUN_HIDDEN|ALIAS|ALIAS_HIDDEN)\s*\(.+?\));?\s?\s?\n/sg); + @defun = ($line =~ /((?:DEFUN|DEFUN_HIDDEN|ALIAS|ALIAS_HIDDEN|DEFPY|DEFPY_HIDDEN)\s*\(.+?\));?\s?\s?\n/sg); @install = ($line =~ /install_element\s*\(\s*[0-9A-Z_]+,\s*&[^;]*;\s*\n/sg); # DEFUN process |