public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] utx8245: fix build breakage due to assert()
Date: Sat, 10 Sep 2011 16:07:45 +0200	[thread overview]
Message-ID: <1315663665-24926-1-git-send-email-wd@denx.de> (raw)
In-Reply-To: <1309376974-12943-1-git-send-email-sjg@chromium.org>

Commit 21726a7 "Add assert() for debug assertions" broke building the
utx8245 board:

dlmalloc.c: In function 'do_check_chunk':
dlmalloc.c:1660: error: 'sz' undeclared (first use in this function)
dlmalloc.c:1660: error: (Each undeclared identifier is reported only once
dlmalloc.c:1660: error: for each function it appears in.)
dlmalloc.c: In function 'do_check_free_chunk':
dlmalloc.c:1689: error: 'next' undeclared (first use in this function)
dlmalloc.c: In function 'do_check_malloced_chunk':
dlmalloc.c:1748: error: 'sz' undeclared (first use in this function)
dlmalloc.c:1750: error: 'room' undeclared (first use in this function)

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 common/dlmalloc.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index f2080c6..c645d73 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1647,9 +1647,7 @@ static void do_check_chunk(mchunkptr p)
 static void do_check_chunk(p) mchunkptr p;
 #endif
 {
-#if 0	/* causes warnings because assert() is off */
   INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-#endif	/* 0 */
 
   /* No checkable chunk is mmapped */
   assert(!chunk_is_mmapped(p));
@@ -1671,9 +1669,7 @@ static void do_check_free_chunk(p) mchunkptr p;
 #endif
 {
   INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-#if 0	/* causes warnings because assert() is off */
   mchunkptr next = chunk_at_offset(p, sz);
-#endif	/* 0 */
 
   do_check_chunk(p);
 
@@ -1737,10 +1733,8 @@ static void do_check_malloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
 static void do_check_malloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
 #endif
 {
-#if 0	/* causes warnings because assert() is off */
   INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
   long room = sz - s;
-#endif	/* 0 */
 
   do_check_inuse_chunk(p);
 
-- 
1.7.6

  parent reply	other threads:[~2011-09-10 14:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-29 19:49 [U-Boot] [PATCH v3] Add assert() for debug assertions Simon Glass
2011-06-29 20:43 ` Mike Frysinger
2011-06-29 21:01   ` Wolfgang Denk
2011-06-29 21:54     ` Mike Frysinger
2011-09-07 22:29       ` Simon Glass
2011-09-09  0:34         ` Mike Frysinger
2011-09-09 13:55           ` Simon Glass
2011-09-09 22:04 ` Wolfgang Denk
2011-09-09 22:38 ` [U-Boot] [PATCH] Fix warning: "assert" redefined Wolfgang Denk
2011-09-09 22:46   ` Simon Glass
2011-09-10 20:37   ` Wolfgang Denk
2011-09-10 14:07 ` Wolfgang Denk [this message]
2011-09-10 20:42   ` [U-Boot] [PATCH] utx8245: fix build breakage due to assert() Wolfgang Denk
2011-09-10 14:19 ` [U-Boot] [PATCH] tegra2: fix warning: "assert" redefined Wolfgang Denk
2011-09-10 20:44   ` Wolfgang Denk
2011-09-12  4:39     ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315663665-24926-1-git-send-email-wd@denx.de \
    --to=wd@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox