From f503b79a9d125249884cd46c9ee04638e3865f93 Mon Sep 17 00:00:00 2001
From: Alessio Vanni <vannilla@firemail.cc>
Date: Thu, 11 Nov 2021 21:45:15 +0100
Subject: -mallinfo is deprecated in favour of mallinfo2

---
 configure.ac                       |  2 +-
 src/statistics/statistics_api.c    |  6 +++---
 src/transport/tcp_service_legacy.c | 14 +++++++-------
 src/util/service.c                 |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0ea55a90f..5c6fedc8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,7 +1152,7 @@ AC_FUNC_FORK
 AC_FUNC_CHOWN
 AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf
                 initgroups strndup gethostbyname2 getpeerucred getpeereid
-                setresuid getifaddrs freeifaddrs getresgid mallinfo malloc_size
+                setresuid getifaddrs freeifaddrs getresgid mallinfo2 malloc_size
                 malloc_usable_size getrusage random srandom stat statfs statvfs
                 wait4 timegm])
 
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index d6c2680b8..6e6acb3e5 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -270,11 +270,11 @@ update_memory_statistics (struct GNUNET_STATISTICS_Handle *h)
 
   if (GNUNET_NO != h->do_destroy)
     return;
-#if HAVE_MALLINFO
+#if HAVE_MALLINFO2
   {
-    struct mallinfo mi;
+    struct mallinfo2 mi;
 
-    mi = mallinfo ();
+    mi = mallinfo2 ();
     current_heap_size = mi.uordblks + mi.fordblks;
   }
 #endif
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
index 8606b353b..65b090187 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -29,7 +29,7 @@
 #include "gnunet_constants.h"
 #include "gnunet_resolver_service.h"
 
-#if HAVE_MALLINFO
+#if HAVE_MALLINFO2
 #include <malloc.h>
 #include "gauger.h"
 #endif
@@ -1450,7 +1450,7 @@ shutdown:
       LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "write");
     GNUNET_break (0 == close (sctx.ready_confirm_fd));
   }
-#if HAVE_MALLINFO
+#if HAVE_MALLINFO2
   {
     char *counter;
 
@@ -1462,9 +1462,9 @@ shutdown:
                                                              "GAUGER_HEAP",
                                                              &counter)))
     {
-      struct mallinfo mi;
+      struct mallinfo2 mi;
 
-      mi = mallinfo ();
+      mi = mallinfo2 ();
       GAUGER (service_name, counter, mi.usmblks, "blocks");
       GNUNET_free (counter);
     }
@@ -1599,7 +1599,7 @@ LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx)
 {
   unsigned int i;
 
-#if HAVE_MALLINFO
+#if HAVE_MALLINFO2
   {
     char *counter;
 
@@ -1611,9 +1611,9 @@ LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx)
                                                              "GAUGER_HEAP",
                                                              &counter)))
     {
-      struct mallinfo mi;
+      struct mallinfo2 mi;
 
-      mi = mallinfo ();
+      mi = mallinfo2 ();
       GAUGER (sctx->service_name, counter, mi.usmblks, "blocks");
       GNUNET_free (counter);
     }
diff --git a/src/util/service.c b/src/util/service.c
index 4c647430d..df4feb0ec 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -31,7 +31,7 @@
 #include "gnunet_resolver_service.h"
 #include "speedup.h"
 
-#if HAVE_MALLINFO
+#if HAVE_MALLINFO2
 #include <malloc.h>
 #include "gauger.h"
 #endif
@@ -2140,7 +2140,7 @@ shutdown:
       LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "write");
     GNUNET_break (0 == close (sh.ready_confirm_fd));
   }
-#if HAVE_MALLINFO
+#if HAVE_MALLINFO2
   {
     char *counter;
 
@@ -2152,9 +2152,9 @@ shutdown:
                                                              "GAUGER_HEAP",
                                                              &counter)))
     {
-      struct mallinfo mi;
+      struct mallinfo2 mi;
 
-      mi = mallinfo ();
+      mi = mallinfo2 ();
       GAUGER (service_name, counter, mi.usmblks, "blocks");
       GNUNET_free (counter);
     }
-- 
cgit v1.2.3