diff options
| author | Quentin Young <qlyoung@qlyoung.net> | 2021-02-08 01:56:07 -0500 |
|---|---|---|
| committer | Quentin Young <qlyoung@qlyoung.net> | 2021-02-10 18:35:15 -0500 |
| commit | 51ab4dbaad5f4abd9db75c74761bebd8524d756c (patch) | |
| tree | 4f7ddd9878bb0b29cb302dbbb018e22aec5bc0db /lib/lib_vty.c | |
| parent | de6223a98d7cd3a38a19f0c97a8692d6ea5e17bc (diff) | |
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 <qlyoung@qlyoung.net>
Diffstat (limited to 'lib/lib_vty.c')
| -rw-r--r-- | lib/lib_vty.c | 6 |
1 files changed, 5 insertions, 1 deletions
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"); |