1) extract.pl is braindead, but I will not touch it willingly.

2) Following common style is always better anyway.

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index cf18a7d10f3e3873629ba54b6d2c571194d64c02..fab7acb58f2a83182324e0db554f4e9debabb289 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-12  Hasso Tepper <hasso@estpak.ee>
+
+       * irdp_interface.c: follow common style while naming vty command
+         functions. Avoids confusion in extract.pl.
+
 2004-06-30  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
        * main.c: define thread_master variable so that linking with

diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index 1e5ad0e9a62c18971fb16ee0ae73787be3473cb9..572b7b951a7a2261644261d7a50d6bf612286ea0 100644 (file)
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -408,8 +408,8 @@ DEFUN (ip_irdp_broadcast,
   return CMD_SUCCESS;
 }
 
-DEFUN (ip_irdp_no,
-       ip_irdp_cmd_no,
+DEFUN (no_ip_irdp,
+       no_ip_irdp_cmd,
        "no ip irdp",
        IP_STR
        "Disable ICMP Router discovery on this interface\n")
@@ -442,8 +442,8 @@ DEFUN (ip_irdp_shutdown,
   return CMD_SUCCESS;
 }
 
-DEFUN (ip_irdp_no_shutdown,
-       ip_irdp_no_shutdown_cmd,
+DEFUN (no_ip_irdp_shutdown,
+       no_ip_irdp_shutdown_cmd,
        "no ip irdp shutdown",
        IP_STR
        "ICMP Router discovery no shutdown on this interface\n")
@@ -625,8 +625,8 @@ DEFUN (ip_irdp_address_preference,
 
 }
 
-DEFUN (ip_irdp_address_preference_no,
-       ip_irdp_address_preference_cmd_no,
+DEFUN (no_ip_irdp_address_preference,
+       no_ip_irdp_address_preference_cmd,
        "no ip irdp address A.B.C.D preference <0-2147483647>",
        IP_STR
        "Alter ICMP Router discovery preference this interface\n"
@@ -765,15 +765,15 @@ irdp_if_init ()
 {
   install_element (INTERFACE_NODE, &ip_irdp_broadcast_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_multicast_cmd);
-  install_element (INTERFACE_NODE, &ip_irdp_cmd_no);
+  install_element (INTERFACE_NODE, &no_ip_irdp_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_shutdown_cmd);
-  install_element (INTERFACE_NODE, &ip_irdp_no_shutdown_cmd);
+  install_element (INTERFACE_NODE, &no_ip_irdp_shutdown_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_holdtime_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_maxadvertinterval_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_minadvertinterval_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_preference_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_address_preference_cmd);
-  install_element (INTERFACE_NODE, &ip_irdp_address_preference_cmd_no);
+  install_element (INTERFACE_NODE, &no_ip_irdp_address_preference_cmd);
 
   install_element (INTERFACE_NODE, &ip_irdp_debug_messages_cmd);
   install_element (INTERFACE_NODE, &ip_irdp_debug_misc_cmd);