commit 23757db11c5378521b7948847e17691f4fc35e0a
author David Lamparter <equinox@opensourcerouting.org> Wed Feb 24 06:26:02 2016 +0100
committer Paul Jakma <paul@quagga.net> Wed Jul 20 12:58:32 2016 +0100
tree 5b62d70b558c89ab751626e5b3f1a028a0be431e
parent 7bd31774cf2c1cfaf74bca87f57f698e20a07e65

*: get rid of "MTYPE 0"

A few places are using 0 in place of the MTYPE_* argument.  The
following rewrite of the alloc tracking won't deal with that, so let's
use MTYPE_TMP instead.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>

ospfd/ospf_opaque.c

diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 61e98f4..697655d 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -22,9 +22,9 @@
  */
 
 /***** MTYPE definitions are not reflected to "memory.h" yet. *****/
-#define MTYPE_OSPF_OPAQUE_FUNCTAB	0
-#define MTYPE_OPAQUE_INFO_PER_TYPE	0
-#define MTYPE_OPAQUE_INFO_PER_ID	0
+#define MTYPE_OSPF_OPAQUE_FUNCTAB	MTYPE_TMP
+#define MTYPE_OPAQUE_INFO_PER_TYPE	MTYPE_TMP
+#define MTYPE_OPAQUE_INFO_PER_ID	MTYPE_TMP
 
 #include <zebra.h>
 

ospfd/ospf_snmp.c

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index ebeffa8..1f9b851 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -1420,13 +1420,13 @@
 static struct ospf_snmp_if *
 ospf_snmp_if_new (void)
 {
-  return XCALLOC (0, sizeof (struct ospf_snmp_if));
+  return XCALLOC (MTYPE_TMP, sizeof (struct ospf_snmp_if));
 }
 
 static void
 ospf_snmp_if_free (struct ospf_snmp_if *osif)
 {
-  XFREE (0, osif);
+  XFREE (MTYPE_TMP, osif);
 }
 
 void

ospfd/ospf_te.c

diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index cd52866..03109bc 100644
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -22,7 +22,7 @@
  */
 
 /***** MTYPE definition is not reflected to "memory.h" yet. *****/
-#define MTYPE_OSPF_MPLS_TE_LINKPARAMS	0
+#define MTYPE_OSPF_MPLS_TE_LINKPARAMS	MTYPE_TMP
 
 #include <zebra.h>