Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / lib / plist.c

diff --git a/lib/plist.c b/lib/plist.c
index d8ef9dcbd5d154ca068009eca40859c1d62293e8..e286a32f9212ba1b699fba7a5a9eaf4df8f0ac0b 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Prefix list functions.
  * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra 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.
- *
- * GNU Zebra 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 <zebra.h>
@@ -1193,9 +1178,7 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
        return CMD_SUCCESS;
 }
 
-#ifndef VTYSH_EXTRACT_PL
 #include "lib/plist_clippy.c"
-#endif
 
 DEFPY (show_ip_prefix_list,
        show_ip_prefix_list_cmd,
@@ -1570,7 +1553,6 @@ static void prefix_list_reset_afi(afi_t afi, int orf)
 
        while ((plist = plist_first(&master->str))) {
                prefix_list_delete(plist);
-               plist_pop(&master->str);
        }
 
        master->recent = NULL;