From 83190a40e2f44f149693bbbb591f6c28a1f68524 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 19 Jan 2017 10:01:02 -0500 Subject: [PATCH] pimd: Cleanup the headers. Signed-off-by: Donald Sharp --- pimd/DEBUG | 4 ---- pimd/pim_assert.c | 4 ---- pimd/pim_cmd.c | 4 ---- pimd/pim_hello.h | 4 ---- pimd/pim_iface.c | 4 ---- pimd/pim_iface.h | 2 +- pimd/pim_ifchannel.h | 4 ---- pimd/pim_igmp.c | 4 ---- pimd/pim_igmp_join.h | 4 ---- pimd/pim_igmpv3.c | 4 ---- pimd/pim_igmpv3.h | 4 ---- pimd/pim_join.c | 4 ---- pimd/pim_join.h | 4 ---- pimd/pim_main.c | 4 ---- pimd/pim_msg.c | 4 ---- pimd/pim_neighbor.h | 4 ---- pimd/pim_oil.c | 4 ---- pimd/pim_pim.h | 4 ---- pimd/pim_signals.c | 4 ---- pimd/pim_signals.h | 4 ---- pimd/pim_ssmpingd.c | 4 ---- pimd/pim_ssmpingd.h | 4 ---- pimd/pim_str.c | 4 ---- pimd/pim_str.h | 4 ---- pimd/pim_tlv.c | 4 ---- pimd/pim_tlv.h | 4 ---- pimd/pim_util.c | 4 ---- pimd/pim_util.h | 4 ---- pimd/pim_vty.c | 4 ---- pimd/pim_vty.h | 4 ---- pimd/test_igmpv3_join.c | 4 ---- 31 files changed, 1 insertion(+), 121 deletions(-) diff --git a/pimd/DEBUG b/pimd/DEBUG index b87542a4a2..a6ad260e82 100644 --- a/pimd/DEBUG +++ b/pimd/DEBUG @@ -1,7 +1,3 @@ -<<<<<<< HEAD - -======= ->>>>>>> origin/master DEBUG HINTS - Check the source is issuing multicast packets with TTL high enough diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c index 385b897bf9..d6f372cc44 100644 --- a/pimd/pim_assert.c +++ b/pimd/pim_assert.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 6fc8406bb2..85baa4eafe 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h index f8e722cd04..3a6d3361ba 100644 --- a/pimd/pim_hello.h +++ b/pimd/pim_hello.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_HELLO_H diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index 7b2c7e2e93..cc4f4f3dce 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -15,10 +15,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h index bd4ebd257d..244de598db 100644 --- a/pimd/pim_iface.h +++ b/pimd/pim_iface.h @@ -16,7 +16,7 @@ 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 -s*/ + */ #ifndef PIM_IFACE_H #define PIM_IFACE_H diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h index c1ce52449a..bfe632135c 100644 --- a/pimd/pim_ifchannel.h +++ b/pimd/pim_ifchannel.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_IFCHANNEL_H diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index a309de690b..4a23e4f668 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h index d9542732b8..ba80db0696 100644 --- a/pimd/pim_igmp_join.h +++ b/pimd/pim_igmp_join.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_IGMP_JOIN_H diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index 4de3b65ec5..f7a6cbd0ce 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h index 893fba60f2..3a4a81d97e 100644 --- a/pimd/pim_igmpv3.h +++ b/pimd/pim_igmpv3.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_IGMPV3_H diff --git a/pimd/pim_join.c b/pimd/pim_join.c index db17c3faec..028f77f532 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_join.h b/pimd/pim_join.h index 27333243db..1eeeef756f 100644 --- a/pimd/pim_join.h +++ b/pimd/pim_join.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_JOIN_H diff --git a/pimd/pim_main.c b/pimd/pim_main.c index e7b86a0404..0749d60b05 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c index e1f20b1496..7ea7b1ad82 100644 --- a/pimd/pim_msg.c +++ b/pimd/pim_msg.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h index 9e419aec18..211eda25c7 100644 --- a/pimd/pim_neighbor.h +++ b/pimd/pim_neighbor.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_NEIGHBOR_H diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index 1c0a2f2bea..0cebe47355 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h index 1f7e1e5d4f..00c5f9012e 100644 --- a/pimd/pim_pim.h +++ b/pimd/pim_pim.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_PIM_H diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c index 0a60bba252..bd4d9e4857 100644 --- a/pimd/pim_signals.c +++ b/pimd/pim_signals.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h index 8a3f836fa3..7b25608c10 100644 --- a/pimd/pim_signals.h +++ b/pimd/pim_signals.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_SIGNALS_H diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c index e443a92d61..0354083332 100644 --- a/pimd/pim_ssmpingd.c +++ b/pimd/pim_ssmpingd.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h index 29759c9531..54f787e2a3 100644 --- a/pimd/pim_ssmpingd.h +++ b/pimd/pim_ssmpingd.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_SSMPINGD_H diff --git a/pimd/pim_str.c b/pimd/pim_str.c index 7f814fcda8..83f2a635b3 100644 --- a/pimd/pim_str.c +++ b/pimd/pim_str.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_str.h b/pimd/pim_str.h index 3536417a95..97263e6a37 100644 --- a/pimd/pim_str.h +++ b/pimd/pim_str.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_STR_H diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c index 2b2a06d368..5223f60e1b 100644 --- a/pimd/pim_tlv.c +++ b/pimd/pim_tlv.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h index d176c26471..9c4ebc9f0f 100644 --- a/pimd/pim_tlv.h +++ b/pimd/pim_tlv.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_TLV_H diff --git a/pimd/pim_util.c b/pimd/pim_util.c index 6d7a8c1908..1125db00a9 100644 --- a/pimd/pim_util.c +++ b/pimd/pim_util.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_util.h b/pimd/pim_util.h index fbb7b0196b..94635466d9 100644 --- a/pimd/pim_util.h +++ b/pimd/pim_util.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_UTIL_H diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index ee4fcd3150..03ee7e92ec 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h index 37ec07b2bf..18a632e016 100644 --- a/pimd/pim_vty.h +++ b/pimd/pim_vty.h @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #ifndef PIM_VTY_H diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c index 81da867e03..29143f362e 100644 --- a/pimd/test_igmpv3_join.c +++ b/pimd/test_igmpv3_join.c @@ -16,10 +16,6 @@ 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 -<<<<<<< HEAD - -======= ->>>>>>> origin/master */ #include