From 4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 29 May 2015 05:48:31 +0200 Subject: *: split & distribute memtypes and stop (re|ab)using lib/ MTYPEs This is a rather large mechanical commit that splits up the memory types defined in lib/memtypes.c and distributes them into *_memory.[ch] files in the individual daemons. The zebra change is slightly annoying because there is no nice place to put the #include "zebra_memory.h" statement. bgpd, ospf6d, isisd and some tests were reusing MTYPEs defined in the library for its own use. This is bad practice and would break when the memtype are made static. Acked-by: Vincent JARDIN Acked-by: Donald Sharp [CF: rebased for cmaster-next] Signed-off-by: David Lamparter Signed-off-by: Christian Franke --- ospf6d/ospf6_interface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ospf6d/ospf6_interface.c') diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index f24ec46da7..f4835d0532 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -45,6 +45,8 @@ #include "ospf6d.h" #include "ospf6_bfd.h" +DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names") + unsigned char conf_debug_ospf6_interface = 0; const char *ospf6_interface_state_str[] = @@ -262,7 +264,7 @@ ospf6_interface_delete (struct ospf6_interface *oi) /* plist_name */ if (oi->plist_name) - XFREE (MTYPE_PREFIX_LIST_STR, oi->plist_name); + XFREE (MTYPE_CFG_PLIST_NAME, oi->plist_name); ospf6_bfd_info_free(&(oi->bfd_info)); @@ -1668,8 +1670,8 @@ DEFUN (ipv6_ospf6_advertise_prefix_list, assert (oi); if (oi->plist_name) - XFREE (MTYPE_PREFIX_LIST_STR, oi->plist_name); - oi->plist_name = XSTRDUP (MTYPE_PREFIX_LIST_STR, argv[0]); + XFREE (MTYPE_CFG_PLIST_NAME, oi->plist_name); + oi->plist_name = XSTRDUP (MTYPE_CFG_PLIST_NAME, argv[0]); ospf6_interface_connected_route_update (oi->interface); @@ -1710,7 +1712,7 @@ DEFUN (no_ipv6_ospf6_advertise_prefix_list, if (oi->plist_name) { - XFREE (MTYPE_PREFIX_LIST_STR, oi->plist_name); + XFREE (MTYPE_CFG_PLIST_NAME, oi->plist_name); oi->plist_name = NULL; } -- cgit v1.2.3