proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 13:06:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1867 from LabNConsulting/working/master/indent2

Browse Source 
more indent.py related changes
This commit is contained in:
Quentin Young 2018-03-13 21:09:15 -04:00 committed by GitHub
commit 548dac0946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/indent.py
View File

@ -6,7 +6,7 @@ import sys, re, subprocess, os
# find all DEFUNs # find all DEFUNs
defun_re = re.compile( defun_re = re.compile(
r'^((DEF(UN(_NOSH|_HIDDEN)?|PY)|ALIAS)\s*\(.*?)^(?=\s*\{)', r'^((DEF(UN(|_ATTR|_CMD_(ELEMENT|FUNC_(DECL|TEXT))|_DEPRECATED|_NOSH|_HIDDEN|SH(|_ATTR|_DEPRECATED|_HIDDEN))?|PY)|ALIAS)\s*\(.*?)^(?=\s*\{)',
re.M | re.S) re.M | re.S)
define_re = re.compile( define_re = re.compile(
r'((^#\s*define[^\n]+[^\\]\n)+)', r'((^#\s*define[^\n]+[^\\]\n)+)',

31
vtysh/vtysh.c
View File

@ -1205,21 +1205,30 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv6_labeled_unicast,
} }
#if defined(HAVE_RPKI) #if defined(HAVE_RPKI)
DEFUNSH(VTYSH_BGPD, rpki, rpki_cmd, "rpki", DEFUNSH(VTYSH_BGPD,
rpki,
rpki_cmd,
"rpki",
"Enable rpki and enter rpki configuration mode\n") "Enable rpki and enter rpki configuration mode\n")
{ {
vty->node = RPKI_NODE; vty->node = RPKI_NODE;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH(VTYSH_BGPD, rpki_exit, rpki_exit_cmd, "exit", DEFUNSH(VTYSH_BGPD,
rpki_exit,
rpki_exit_cmd,
"exit",
"Exit current mode and down to previous mode\n") "Exit current mode and down to previous mode\n")
{ {
vty->node = CONFIG_NODE; vty->node = CONFIG_NODE;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH(VTYSH_BGPD, rpki_quit, rpki_quit_cmd, "quit", DEFUNSH(VTYSH_BGPD,
rpki_quit,
rpki_quit_cmd,
"quit",
"Exit current mode and down to previous mode\n") "Exit current mode and down to previous mode\n")
{ {
return rpki_exit(self, vty, argc, argv); return rpki_exit(self, vty, argc, argv);
@ -1326,7 +1335,8 @@ DEFUNSH(VTYSH_OSPFD, router_ospf, router_ospf_cmd,
"router ospf [(1-65535)] [vrf NAME]", "router ospf [(1-65535)] [vrf NAME]",
"Enable a routing process\n" "Enable a routing process\n"
"Start OSPF configuration\n" "Start OSPF configuration\n"
"Instance ID\n" VRF_CMD_HELP_STR) "Instance ID\n"
VRF_CMD_HELP_STR)
{ {
vty->node = OSPF_NODE; vty->node = OSPF_NODE;
return CMD_SUCCESS; return CMD_SUCCESS;
@ -1802,14 +1812,16 @@ DEFSH(VTYSH_ZEBRA, vtysh_no_vrf_cmd, "no vrf NAME", NO_STR
"Delete a pseudo vrf's configuration\n" "Delete a pseudo vrf's configuration\n"
"VRF's name\n") "VRF's name\n")
DEFUNSH(VTYSH_NS, vtysh_exit_logicalrouter, vtysh_exit_logicalrouter_cmd, DEFUNSH(VTYSH_NS, vtysh_exit_logicalrouter,
"exit", "Exit current mode and down to previous mode\n") vtysh_exit_logicalrouter_cmd, "exit",
"Exit current mode and down to previous mode\n")
{ {
return vtysh_exit(vty); return vtysh_exit(vty);
} }
DEFUNSH(VTYSH_NS, vtysh_quit_logicalrouter, vtysh_quit_logicalrouter_cmd, DEFUNSH(VTYSH_NS, vtysh_quit_logicalrouter,
"quit", "Exit current mode and down to previous mode\n") vtysh_quit_logicalrouter_cmd, "quit",
"Exit current mode and down to previous mode\n")
{ {
return vtysh_exit_logicalrouter(self, vty, argc, argv); return vtysh_exit_logicalrouter(self, vty, argc, argv);
} }
@ -2121,7 +2133,6 @@ DEFUNSH(VTYSH_ALL, vtysh_log_facility, vtysh_log_facility_cmd,
"log facility <kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>", "log facility <kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>",
"Logging control\n" "Logging control\n"
"Facility parameter for syslog messages\n" LOG_FACILITY_DESC) "Facility parameter for syslog messages\n" LOG_FACILITY_DESC)
{ {
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2131,7 +2142,6 @@ DEFUNSH(VTYSH_ALL, no_vtysh_log_facility, no_vtysh_log_facility_cmd,
"Logging control\n" "Logging control\n"
"Reset syslog facility to default (daemon)\n" "Reset syslog facility to default (daemon)\n"
"Syslog facility\n") "Syslog facility\n")
{ {
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -2141,7 +2151,6 @@ DEFUNSH_DEPRECATED(
"log trap <emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>", "log trap <emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>",
"Logging control\n" "Logging control\n"
"(Deprecated) Set logging level and default for all destinations\n" LOG_LEVEL_DESC) "(Deprecated) Set logging level and default for all destinations\n" LOG_LEVEL_DESC)
{ {
return CMD_SUCCESS; return CMD_SUCCESS;
} }