@matheusbsbs / matheus-bagliano / commits / 70597e8386

nedmalloc: avoid compiler warning about unused value

Cast the evaluated value of the macro INITIAL_LOCK to void to instruct the compiler that we're not interested in said value nor the following warning: In file included from compat/nedmalloc/nedmalloc.c:63: compat/nedmalloc/malloc.c.h: In function ‘init_user_mstate’: compat/nedmalloc/malloc.c.h:1706:62: error: right-hand operand of comma expression has no effect [-Werror=unused-value] 1706 | #define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), 0) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ compat/nedmalloc/malloc.c.h:5020:3: note: in expansion of macro ‘INITIAL_LOCK’ 5020 | INITIAL_LOCK(&m->mutex); | ^~~~~~~~~~~~ Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

René Scharfe committed Aug 7, 2019 at 15:09 UTC 70597e838601ee6be5c43ece255c9df47f8fe9a2

1 file changed +2 -2

compat/nedmalloc/malloc.c.h

+2 -2

@@ -3066,7 +3066,7 @@ static int init_mparams(void) {

3066 #if !ONLY_MSPACES

3067 /* Set up lock for main malloc area */

3068 gm->mflags = mparams.default_mflags;

3069 - INITIAL_LOCK(&gm->mutex);

3069 + (void)INITIAL_LOCK(&gm->mutex);

3070 #endif

3071

3072 #if (FOOTERS && !INSECURE)

@@ -5017,7 +5017,7 @@ static mstate init_user_mstate(char* tbase, size_t tsize) {

5017 mchunkptr msp = align_as_chunk(tbase);

5018 mstate m = (mstate)(chunk2mem(msp));

5019 memset(m, 0, msize);

5020 - INITIAL_LOCK(&m->mutex);

5020 + (void)INITIAL_LOCK(&m->mutex);

5021 msp->head = (msize|PINUSE_BIT|CINUSE_BIT);

5022 m->seg.base = m->least_addr = tbase;

5023 m->seg.size = m->footprint = m->max_footprint = tsize;