From 51ab4dbaad5f4abd9db75c74761bebd8524d756c Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Mon, 8 Feb 2021 01:56:07 -0500 Subject: lib: support mallinfo2() mallinfo() is deprecated as of glibc 2.33 and emits a warning if used. Support mallinfo2() if available. Signed-off-by: Quentin Young --- lib/lib_vty.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/lib_vty.c') diff --git a/lib/lib_vty.c b/lib/lib_vty.c index cd8b5c9809..128261a39c 100644 --- a/lib/lib_vty.c +++ b/lib/lib_vty.c @@ -43,10 +43,14 @@ #include "vty.h" #include "command.h" -#ifdef HAVE_MALLINFO +#if defined(HAVE_MALLINFO2) || defined(HAVE_MALLINFO) static int show_memory_mallinfo(struct vty *vty) { +#if defined(HAVE_MALLINFO2) + struct mallinfo2 minfo = mallinfo2(); +#elif defined(HAVE_MALLINFO) struct mallinfo minfo = mallinfo(); +#endif char buf[MTYPE_MEMSTR_LEN]; vty_out(vty, "System allocator statistics:\n"); -- cgit v1.2.3