diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-01-06 10:37:22 +0100 |
|---|---|---|
| committer | Christian Franke <nobody@nowhere.ws> | 2016-09-19 18:35:50 +0200 |
| commit | fc7948fafee457874a21aa955c56a617b563f85c (patch) | |
| tree | 919884f8b46b3b7ddbd6137d89dc8990e0739316 /lib/memory.h | |
| parent | 3b4cd7837562cd78fe80bde94f5aa6729b2f755d (diff) | |
lib: migrate to new memory-type handling
Move over to the new allocation counting added in the previous commit.
(This commit is mostly mechanical.)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Diffstat (limited to 'lib/memory.h')
| -rw-r--r-- | lib/memory.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/memory.h b/lib/memory.h index 0f3ceee1be..e8243f1733 100644 --- a/lib/memory.h +++ b/lib/memory.h @@ -150,7 +150,6 @@ extern void *qstrdup (struct memtype *mt, const char *str) extern void qfree (struct memtype *mt, void *ptr) __attribute__ ((nonnull (1))); -#if 0 #define XMALLOC(mtype, size) qmalloc(mtype, size) #define XCALLOC(mtype, size) qcalloc(mtype, size) #define XREALLOC(mtype, ptr, size) qrealloc(mtype, ptr, size) @@ -162,9 +161,6 @@ static inline size_t mtype_stats_alloc(struct memtype *mt) { return mt->n_alloc; } -#endif -/* still here until next commit */ -#include "memory_vty.h" /* NB: calls are ordered by memgroup; and there is a call with mt == NULL for * each memgroup (so that a header can be printed, and empty memgroups show) @@ -176,4 +172,6 @@ extern int qmem_walk (qmem_walk_fn *func, void *arg); extern void memory_oom (size_t size, const char *name); +#include "memtypes.h" + #endif /* _QUAGGA_MEMORY_H */ |