From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 7 Feb 2019 14:35:01 +0000 (-0500)
Subject: lib: MTYPE_PREFIX_FLOWSPEC should not be exposed by memory.h
X-Git-Tag: frr-7.1~279^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ecc4d697cd463cf84fd4a10bd09a46f92af9e1a1;p=mirror_frr.git

lib: MTYPE_PREFIX_FLOWSPEC should not be exposed by memory.h

This MTYPE should be owned by prefix.c as a STATIC for the file.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/memory.c b/lib/memory.c
index fee23a75a..149e294d5 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -35,7 +35,6 @@ struct memgroup **mg_insert = &mg_first;
 
 DEFINE_MGROUP(LIB, "libfrr")
 DEFINE_MTYPE(LIB, TMP, "Temporary memory")
-DEFINE_MTYPE(LIB, PREFIX_FLOWSPEC, "Prefix Flowspec")
 
 static inline void mt_count_alloc(struct memtype *mt, size_t size, void *ptr)
 {
diff --git a/lib/memory.h b/lib/memory.h
index 2d6c14477..1a0269f8b 100644
--- a/lib/memory.h
+++ b/lib/memory.h
@@ -137,7 +137,6 @@ struct memgroup {
 
 DECLARE_MGROUP(LIB)
 DECLARE_MTYPE(TMP)
-DECLARE_MTYPE(PREFIX_FLOWSPEC)
 
 
 extern void *qmalloc(struct memtype *mt, size_t size)
diff --git a/lib/prefix.c b/lib/prefix.c
index 07eb1785b..babd4304d 100644
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -30,6 +30,7 @@
 #include "lib_errors.h"
 
 DEFINE_MTYPE_STATIC(LIB, PREFIX, "Prefix")
+DEFINE_MTYPE_STATIC(LIB, PREFIX_FLOWSPEC, "Prefix Flowspec")
 
 /* Maskbit. */
 static const uint8_t maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0,