From 9f2982ab69522e61dd2544dbd736aaad9749a224 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 8 May 2018 09:13:54 -0400 Subject: [PATCH] zebra: Remove zebra_static.c and .h These are no longer needed so remove. Signed-off-by: Donald Sharp --- zebra/interface.c | 1 - zebra/subdir.am | 2 -- zebra/zebra_mpls_vty.c | 1 - zebra/zebra_static.c | 22 ---------------------- zebra/zebra_static.h | 25 ------------------------- zebra/zebra_vrf.c | 1 - zebra/zebra_vty.c | 1 - 7 files changed, 53 deletions(-) delete mode 100644 zebra/zebra_static.c delete mode 100644 zebra/zebra_static.h diff --git a/zebra/interface.c b/zebra/interface.c index 7fe7058de9..4211155c27 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -48,7 +48,6 @@ #include "zebra/rt_netlink.h" #include "zebra/interface.h" #include "zebra/zebra_vxlan.h" -#include "zebra/zebra_static.h" #define ZEBRA_PTM_SUPPORT diff --git a/zebra/subdir.am b/zebra/subdir.am index d3abcef6d5..73354ec38e 100644 --- a/zebra/subdir.am +++ b/zebra/subdir.am @@ -63,7 +63,6 @@ zebra_zebra_SOURCES = \ zebra/zebra_rib.c \ zebra/zebra_rnh.c \ zebra/zebra_routemap.c \ - zebra/zebra_static.c \ zebra/zebra_vrf.c \ zebra/zebra_vty.c \ zebra/zebra_vxlan.c \ @@ -108,7 +107,6 @@ noinst_HEADERS += \ zebra/zebra_pw.h \ zebra/zebra_rnh.h \ zebra/zebra_routemap.h \ - zebra/zebra_static.h \ zebra/zebra_vrf.h \ zebra/zebra_vxlan.h \ zebra/zebra_vxlan_private.h \ diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c index 01bc66e5cd..2e02b12311 100644 --- a/zebra/zebra_mpls_vty.c +++ b/zebra/zebra_mpls_vty.c @@ -37,7 +37,6 @@ #include "zebra/zebra_rnh.h" #include "zebra/redistribute.h" #include "zebra/zebra_routemap.h" -#include "zebra/zebra_static.h" static int zebra_mpls_transit_lsp(struct vty *vty, int add_cmd, const char *inlabel_str, const char *gate_str, diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c deleted file mode 100644 index d6e07f1254..0000000000 --- a/zebra/zebra_static.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Static Routing Information code - * Copyright (C) 2016 Cumulus Networks - * Donald Sharp - * - * This file is part of Quagga. - * - * Quagga is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * Quagga is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 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 - */ -#include diff --git a/zebra/zebra_static.h b/zebra/zebra_static.h deleted file mode 100644 index 4885b1b8fd..0000000000 --- a/zebra/zebra_static.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Static Routing Information header - * Copyright (C) 2016 Cumulus Networks - * Donald Sharp - * - * This file is part of Quagga. - * - * Quagga is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * Quagga is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * 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 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 __ZEBRA_STATIC_H__ -#define __ZEBRA_STATIC_H__ - -#endif diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index 607001fe2b..05ae418b57 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -35,7 +35,6 @@ #include "zebra/zebra_rnh.h" #include "zebra/router-id.h" #include "zebra/zebra_memory.h" -#include "zebra/zebra_static.h" #include "zebra/interface.h" #include "zebra/zebra_mpls.h" #include "zebra/zebra_vxlan.h" diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 117ed3a955..7eb6fe828e 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -41,7 +41,6 @@ #include "zebra/zebra_rnh.h" #include "zebra/redistribute.h" #include "zebra/zebra_routemap.h" -#include "zebra/zebra_static.h" #include "lib/json.h" #include "zebra/zebra_vxlan.h" #ifndef VTYSH_EXTRACT_PL -- 2.39.5