Re: [PATCH 1/3] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT

[Heinrich Schuchardt]

On 8/1/23 00:33, Sean Anderson wrote:

With CONFIG_IS_ENABLED we can eliminate some ifdefs.

Signed-off-by: Sean Anderson <sean.ander...@seco.com>

Reviewed-by: Heinrich Schuchardt <xypron.g...@gmx.de>

---

  common/dlmalloc.c | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 0f9b7262d5..30c78ae976 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -588,9 +588,7 @@ static void malloc_bin_reloc(void)
  static inline void malloc_bin_reloc(void) {}
  #endif

-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
  static void malloc_init(void);
-#endif

  ulong mem_malloc_start = 0;
  ulong mem_malloc_end = 0;
@@ -625,9 +623,8 @@ void mem_malloc_init(ulong start, ulong size)
        mem_malloc_end = start + size;
        mem_malloc_brk = start;

-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
-       malloc_init();
-#endif
+       if (CONFIG_IS_ENABLED(SYS_MALLOC_DEFAULT_TO_INIT))
+               malloc_init();

        debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start,
              mem_malloc_end);
@@ -733,7 +730,6 @@ static unsigned int max_n_mmaps = 0;
  static unsigned long max_mmapped_mem = 0;
  #endif

-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
  static void malloc_init(void)
  {
        int i, j;
@@ -762,7 +758,6 @@ static void malloc_init(void)
        memset((void *)&current_mallinfo, 0, sizeof(struct mallinfo));
  #endif
  }
-#endif

  /*
    Debugging support