[cmaster-next] [PATCH] *: fix up DEFUNs without install_element calls
David Lamparter
equinox at opensourcerouting.org
Mon Dec 5 14:40:05 EST 2016
These now generate warnings which will break the build with -Werror.
Note this may have enabled commands that should be disabled, or the
other way around...
Signed-off-by: David Lamparter <equinox at opensourcerouting.org>
---
"logical-router ..." needs more checking.
Also, not sure wtf is up with all the "ospf distance" commands.
Either way, this fixes all the compile warnings about unused DEFUNs...
please send patches if some bits are wrong...
-David
---
bgpd/bgp_vty.c | 1 +
lib/command.c | 15 ---------------
lib/if.c | 2 ++
ospf6d/ospf6_neighbor.c | 1 +
ospf6d/ospf6_top.c | 4 ++++
ospfd/ospf_ri.c | 1 +
ospfd/ospf_vty.c | 2 ++
ripngd/ripngd.c | 2 ++
vtysh/vtysh.c | 24 +++++-------------------
zebra/interface.c | 1 +
10 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 41f09e3..4532e24 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -11379,6 +11379,7 @@ community_list_vty (void)
/* Community-list. */
install_element (CONFIG_NODE, &ip_community_list_standard_cmd);
+ install_element (CONFIG_NODE, &ip_community_list_expanded_all_cmd);
install_element (CONFIG_NODE, &no_ip_community_list_standard_all_cmd);
install_element (CONFIG_NODE, &no_ip_community_list_expanded_all_cmd);
install_element (VIEW_NODE, &show_ip_community_list_cmd);
diff --git a/lib/command.c b/lib/command.c
index e51ff83..092037b 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2069,21 +2069,6 @@ DEFUN (config_log_syslog,
}
}
-DEFUN_DEPRECATED (config_log_syslog_facility,
- config_log_syslog_facility_cmd,
- "log syslog facility (kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7)",
- "Logging control\n"
- "Logging goes to syslog\n"
- "(Deprecated) Facility parameter for syslog messages\n"
- LOG_FACILITY_DESC)
-{
- int facility = facility_match(argv[3]->arg);
-
- zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
- zlog_default->facility = facility;
- return CMD_SUCCESS;
-}
-
DEFUN (no_config_log_syslog,
no_config_log_syslog_cmd,
"no log syslog [<kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|local0|local1|local2|local3|local4|local5|local6|local7>] [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>]",
diff --git a/lib/if.c b/lib/if.c
index 128fc67..a1bac2c 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -838,6 +838,7 @@ if_cmd_init (void)
install_element (INTERFACE_NODE, &no_interface_desc_cmd);
}
+#if 0
/* For debug purpose. */
DEFUN (show_address,
show_address_cmd,
@@ -907,6 +908,7 @@ DEFUN (show_address_vrf_all,
}
return CMD_SUCCESS;
}
+#endif
/* Allocate connected structure. */
struct connected *
diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 385232f..f24ee84 100644
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -913,6 +913,7 @@ void
ospf6_neighbor_init (void)
{
install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_cmd);
+ install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_one_cmd);
}
DEFUN (debug_ospf6_neighbor,
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 4c50828..65ded28 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -622,6 +622,7 @@ DEFUN (no_ospf6_distance_ospf6,
return CMD_SUCCESS;
}
+#if 0
DEFUN (ospf6_distance_source,
ospf6_distance_source_cmd,
"distance (1-255) X:X::X:X/M [WORD]",
@@ -652,6 +653,7 @@ DEFUN (no_ospf6_distance_source,
return CMD_SUCCESS;
}
+#endif
DEFUN (ospf6_interface_area,
ospf6_interface_area_cmd,
@@ -833,6 +835,7 @@ DEFUN (no_ospf6_stub_router_admin,
return CMD_SUCCESS;
}
+#if 0
DEFUN (ospf6_stub_router_startup,
ospf6_stub_router_startup_cmd,
"stub-router on-startup (5-86400)",
@@ -878,6 +881,7 @@ DEFUN (no_ospf6_stub_router_shutdown,
{
return CMD_SUCCESS;
}
+#endif
static void
ospf6_show (struct vty *vty, struct ospf6 *o)
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c
index 28957e0..883ea7c 100644
--- a/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@ -1662,6 +1662,7 @@ ospf_router_info_register_vty (void)
install_element (OSPF_NODE, &pce_neighbor_cmd);
install_element (OSPF_NODE, &no_pce_neighbor_cmd);
install_element (OSPF_NODE, &pce_cap_flag_cmd);
+ install_element (OSPF_NODE, &no_pce_cap_flag_cmd);
return;
}
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 776b1a0..12ae942 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7800,6 +7800,7 @@ DEFUN (ospf_distance_ospf,
return CMD_SUCCESS;
}
+#if 0
DEFUN (ospf_distance_source,
ospf_distance_source_cmd,
"distance (1-255) A.B.C.D/M",
@@ -7881,6 +7882,7 @@ DEFUN (no_ospf_distance_source_access_list,
return CMD_SUCCESS;
}
+#endif
DEFUN (ip_ospf_mtu_ignore,
ip_ospf_mtu_ignore_addr_cmd,
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index ca8850e..fefb1fd 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2575,6 +2575,7 @@ DEFUN (no_ripng_timers,
return CMD_SUCCESS;
}
+#if 0
DEFUN (show_ipv6_protocols,
show_ipv6_protocols_cmd,
"show ipv6 protocols",
@@ -2601,6 +2602,7 @@ DEFUN (show_ipv6_protocols,
return CMD_SUCCESS;
}
+#endif
/* Please be carefull to use this command. */
DEFUN (ripng_default_information_originate,
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 0a83b56..9bcbe73 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1560,24 +1560,6 @@ DEFUNSH (VTYSH_BGPD,
return CMD_SUCCESS;
}
-DEFUNSH (VTYSH_ZEBRA,
- vtysh_exit_zebra,
- vtysh_exit_zebra_cmd,
- "exit",
- "Exit current mode and down to previous mode\n")
-{
- return vtysh_exit (vty);
-}
-
-DEFUNSH (VTYSH_ZEBRA,
- vtysh_quit_zebra,
- vtysh_quit_zebra_cmd,
- "quit",
- "Exit current mode and down to previous mode\n")
-{
- return vtysh_exit_zebra (self, vty, argc, argv);
-}
-
DEFUNSH (VTYSH_RIPD,
vtysh_exit_ripd,
vtysh_exit_ripd_cmd,
@@ -3122,7 +3104,8 @@ vtysh_init_vty (void)
/* "exit" command. */
install_element (VIEW_NODE, &vtysh_exit_all_cmd);
install_element (CONFIG_NODE, &vtysh_exit_all_cmd);
- /* install_element (CONFIG_NODE, &vtysh_quit_all_cmd); */
+ install_element (VIEW_NODE, &vtysh_quit_all_cmd);
+ install_element (CONFIG_NODE, &vtysh_quit_all_cmd);
install_element (RIP_NODE, &vtysh_exit_ripd_cmd);
install_element (RIP_NODE, &vtysh_quit_ripd_cmd);
install_element (RIPNG_NODE, &vtysh_exit_ripngd_cmd);
@@ -3226,6 +3209,8 @@ vtysh_init_vty (void)
install_element (INTERFACE_NODE, &vtysh_quit_interface_cmd);
install_element (NS_NODE, &vtysh_end_all_cmd);
+
+ install_element (CONFIG_NODE, &vtysh_ns_cmd);
install_element (NS_NODE, &vtysh_exit_ns_cmd);
install_element (NS_NODE, &vtysh_quit_ns_cmd);
@@ -3255,6 +3240,7 @@ vtysh_init_vty (void)
#if defined(ENABLE_BGP_VNC)
install_element (BGP_NODE, &vnc_defaults_cmd);
install_element (BGP_NODE, &vnc_nve_group_cmd);
+ install_element (BGP_NODE, &vnc_l2_group_cmd);
#endif
install_element (BGP_NODE, &address_family_ipv4_unicast_cmd);
install_element (BGP_NODE, &address_family_ipv4_multicast_cmd);
diff --git a/zebra/interface.c b/zebra/interface.c
index 93a059a..8eddd30 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -2909,6 +2909,7 @@ zebra_if_init (void)
install_element(LINK_PARAMS_NODE, &link_params_enable_cmd);
install_element(LINK_PARAMS_NODE, &no_link_params_enable_cmd);
install_element(LINK_PARAMS_NODE, &link_params_metric_cmd);
+ install_element(LINK_PARAMS_NODE, &no_link_params_metric_cmd);
install_element(LINK_PARAMS_NODE, &link_params_maxbw_cmd);
install_element(LINK_PARAMS_NODE, &link_params_max_rsv_bw_cmd);
install_element(LINK_PARAMS_NODE, &link_params_unrsv_bw_cmd);
--
2.7.3
More information about the dev
mailing list