[PATCH] dlmalloc: fix compiler warning
Alexander Aring
alex.aring at gmail.com
Thu Nov 7 00:46:00 EST 2013
This patch fix a compiler warning while building sandbox barebox with
gcc version 4.8.2.
common/dlmalloc.c: In function ‘barebox_calloc’:
common/dlmalloc.c:1756:2: warning: ISO C90 forbids mixed declarations
and code [-Wdeclaration-after-statement]
void *mem = malloc(sz);
^
Signed-off-by: Alexander Aring <alex.aring at gmail.com>
---
common/dlmalloc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index b4341fe..f006206 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1745,6 +1745,7 @@ void *calloc(size_t n, size_t elem_size)
mchunkptr p;
INTERNAL_SIZE_T csz;
INTERNAL_SIZE_T sz = n * elem_size;
+ void *mem;
/* check if expand_top called, in which case don't need to clear */
mchunkptr oldtop = top;
@@ -1753,7 +1754,7 @@ void *calloc(size_t n, size_t elem_size)
if ((long)n < 0)
return NULL;
- void *mem = malloc(sz);
+ mem = malloc(sz);
if (!mem)
return NULL;
--
1.8.4.2
More information about the barebox
mailing list