From 1b88c3cb4cff391c6d508b90e78a5feb729f0d7b Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Fri, 21 Jun 2019 08:04:57 +0200
Subject: [PATCH] bfdd: use MTYPE_STATIC

MTYPE definitions should be local to the file using them whereever
possible.  Also remove some superfluous ;

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---
 bfdd/bfd.c    |  5 ++++-
 bfdd/bfd.h    | 15 +++++----------
 bfdd/bfdd.c   | 11 +++--------
 bfdd/config.c |  2 ++
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 4354431820..c69e565d15 100644
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -31,7 +31,10 @@
 
 #include "bfd.h"
 
-DEFINE_QOBJ_TYPE(bfd_session);
+DEFINE_MTYPE_STATIC(BFDD, BFDD_CONFIG, "long-lived configuration memory")
+DEFINE_MTYPE_STATIC(BFDD, BFDD_SESSION_OBSERVER, "Session observer")
+DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF")
+DEFINE_QOBJ_TYPE(bfd_session)
 
 /*
  * Prototypes
diff --git a/bfdd/bfd.h b/bfdd/bfd.h
index 213e905bf0..ec31c8cbc6 100644
--- a/bfdd/bfd.h
+++ b/bfdd/bfd.h
@@ -41,14 +41,9 @@
 #define BFDD_JSON_CONV_OPTIONS (0)
 #endif
 
-DECLARE_MGROUP(BFDD);
-DECLARE_MTYPE(BFDD_TMP);
-DECLARE_MTYPE(BFDD_CONFIG);
-DECLARE_MTYPE(BFDD_LABEL);
-DECLARE_MTYPE(BFDD_CONTROL);
-DECLARE_MTYPE(BFDD_SESSION_OBSERVER);
-DECLARE_MTYPE(BFDD_NOTIFICATION);
-DECLARE_MTYPE(BFDD_VRF);
+DECLARE_MGROUP(BFDD)
+DECLARE_MTYPE(BFDD_CONTROL)
+DECLARE_MTYPE(BFDD_NOTIFICATION)
 
 struct bfd_timers {
 	uint32_t desired_min_tx;
@@ -259,9 +254,9 @@ struct bfd_session {
 	uint64_t refcount; /* number of pointers referencing this. */
 
 	/* VTY context data. */
-	QOBJ_FIELDS;
+	QOBJ_FIELDS
 };
-DECLARE_QOBJ_TYPE(bfd_session);
+DECLARE_QOBJ_TYPE(bfd_session)
 
 struct peer_label {
 	TAILQ_ENTRY(peer_label) pl_entry;
diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index 06e01abcfa..6c277c98f5 100644
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -29,14 +29,9 @@
 /*
  * FRR related code.
  */
-DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon");
-DEFINE_MTYPE(BFDD, BFDD_TMP, "short-lived temporary memory");
-DEFINE_MTYPE(BFDD, BFDD_CONFIG, "long-lived configuration memory");
-DEFINE_MTYPE(BFDD, BFDD_LABEL, "long-lived label memory");
-DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory");
-DEFINE_MTYPE(BFDD, BFDD_SESSION_OBSERVER, "Session observer");
-DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data");
-DEFINE_MTYPE(BFDD, BFDD_VRF, "BFD VRF");
+DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon")
+DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory")
+DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data")
 
 /* Master of threads. */
 struct thread_master *master;
diff --git a/bfdd/config.c b/bfdd/config.c
index 74e7d63d0c..0c0bac0aaa 100644
--- a/bfdd/config.c
+++ b/bfdd/config.c
@@ -30,6 +30,8 @@
 
 #include "bfd.h"
 
+DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory")
+
 /*
  * Definitions
  */
-- 
2.39.5