Merge pull request #5468 from qlyoung/bgpd-remove-bgp-attr-dup

[mirror_frr.git] / ospfd / ospf_vty.h

diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h
index 72d776ed890a724a2334bfdfb9f9cc06c250b0b0..79aabe7b4ea4397b718b9e6240dbcba276ce779f 100644 (file)
--- a/ospfd/ospf_vty.h
+++ b/ospfd/ospf_vty.h
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _QUAGGA_OSPF_VTY_H
@@ -28,8 +27,7 @@
                int retv;                                                      \
                retv = str2area_id((STR), &(V), &(F));                         \
                if (retv < 0) {                                                \
-                       vty_out(vty, "%% Invalid OSPF area ID%s",              \
-                               VTY_NEWLINE);                                  \
+                       vty_out(vty, "%% Invalid OSPF area ID\n");             \
                        return CMD_WARNING;                                    \
                }                                                              \
        }
@@ -39,14 +37,14 @@
                int retv;                                                      \
                retv = str2area_id((STR), &(V), &(F));                         \
                if (retv < 0) {                                                \
-                       vty_out(vty, "%% Invalid OSPF area ID%s",              \
-                               VTY_NEWLINE);                                  \
+                       vty_out(vty, "%% Invalid OSPF area ID\n");             \
                        return CMD_WARNING;                                    \
                }                                                              \
                if (OSPF_IS_AREA_ID_BACKBONE((V))) {                           \
                        vty_out(vty,                                           \
-                               "%% You can't configure %s to backbone%s",     \
-                               NAME, VTY_NEWLINE);                            \
+                               "%% You can't configure %s to backbone\n",     \
+                               NAME);                                         \
+                       return CMD_WARNING;                                    \
                }                                                              \
        }
 
@@ -55,6 +53,5 @@ extern void ospf_vty_init(void);
 extern void ospf_vty_show_init(void);
 extern void ospf_vty_clear_init(void);
 extern int str2area_id(const char *, struct in_addr *, int *);
-extern void area_id2str(char *, int, struct in_addr *, int);
 
 #endif /* _QUAGGA_OSPF_VTY_H */