diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-07-28 17:23:49 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-07-28 13:27:48 +0200 |
| commit | c66f9c6186acb837a4fab441469a26b406f08e37 (patch) | |
| tree | 55cccc9eedfbfdd8e2b424f4cac1535c7472fa3b /ospfd | |
| parent | pimd: relegate pim_igmp_join.c into a header file (diff) | |
| download | frr-c66f9c6186acb837a4fab441469a26b406f08e37.tar.xz frr-c66f9c6186acb837a4fab441469a26b406f08e37.zip | |
*: 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.
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
[DL: v2: fix XFREE(0, foo) calls too]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_opaque.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_snmp.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_te.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index 4c05c7725..ff505b6bd 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> #ifdef HAVE_OPAQUE_LSA diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index 0eaf44b4d..bedcb559b 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -1420,13 +1420,13 @@ struct ospf_snmp_if 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 diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index db06623dd..155a773b3 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> |