From patchwork Tue Nov 28 12:23:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 119850 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp3021736edl; Tue, 28 Nov 2017 04:25:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMYuf4LfkWLoV3bwQzurClrVVr+vvBsey9m91p99uerMf0FEssiJ7OMK4wCOsykEucY1d9gV X-Received: by 10.80.206.26 with SMTP id y26mr2493326edi.117.1511871923328; Tue, 28 Nov 2017 04:25:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511871923; cv=none; d=google.com; s=arc-20160816; b=03I7DPT3bKuTQae0mCH1UdmiU5mc7qCCHVx19W2XT8ibguGbIHGXg5lM5n4XheKIB/ RyRTeDYAhO465bG17ajZH4kExPOJbmWIsVX+8UWskhYx1OdFkqGHxywdCBkoo2vkQVqr 7hPZk0CfjKxr10lNE8PgQoRGx+yFQFgUz492nBKwCsw6KAckqiNoEUUIOWrUAm0OJBHk dHTCQ/fHxODX0v+iWJDDFRTNitleDuGvo93VJC1p8v6zHguUVK1ggNpPPMsAAVYBvBUA CeZKJ4CNLtGXH+H+uJSjAMEpCIwmOrzKWycRerwPzyHv/DQrfk9ImspM94dhitWyQ9nS vWHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=ScIIiyIEkPEVWiJ9y0CnD8ilp4foO2RO/V2A/XxwtkI=; b=nHhkna24cj7gEF8MROXJJrU6AIR3/hf/LCy432Icteu7KrQ/ERih4QEPAYzFUYDN5/ ZcaSozhoiESSzOJUvYt06iK9VJmo8UpRhYE8mSKSp28Qb/XLHqsdoBHwuLdFS5V9OewG ZdGtSecP1Ep0ikRUNkqepbXLm7ckx7phjRm6/ioHBSCdbJpsxCu3EJhhEpYOkXv1DZzh tkXBXNJc3Lan0xIz6f75zuW4ZamCqFcjs3pqrfKW+CD6FdnCkAi2JdRCIbGFHTUY4N2l GGik4kid0tSRv+NRAFoQy79IIuIR4oaZJmtoLxALxUEuckCTJr9Sii5wZKOXih2igoL/ Va3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=jAoVcgPx; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id s11si2631381edj.532.2017.11.28.04.25.22; Tue, 28 Nov 2017 04:25:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=jAoVcgPx; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id C2DB4C21E44; Tue, 28 Nov 2017 12:24:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CD988C21DF0; Tue, 28 Nov 2017 12:24:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12036C21D75; Tue, 28 Nov 2017 12:24:19 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 0592EC21D75 for ; Tue, 28 Nov 2017 12:24:18 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id vASCNT1s005103; Tue, 28 Nov 2017 21:23:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com vASCNT1s005103 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511871817; bh=qWOPWwzMEZrcaq20D8kbVQbCRwCkWjTTUqi9BMhPfIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jAoVcgPxJCa1dlvLZzFztgd7S1e40o0mRTquMg7b/qh3QZniC4tLuF7cVEPAfdgUa 3YO2U6sgmLorwB+V4wjX+ur6FfZFo8W6XxrAffm5fBt/VkszRGv7IkIZvJtynQUfvF IWUUbpwzVnrIh0envmUvnm/djHeK0D3qzouLBA+/js+FPeLmU43qH5RNT1xxyX1Pom T5DzU2OZTVI3LSxmVlZoJd1XK38lzF8w4gdOJ4EBTBEoRX+Nlmv4RfXDn+ErRJkEDQ raB8LOAJf3tXcDPAwXRGtkYyrKqyyByRdtQdItmd5YxWDaiqngABxqlcwXZnUJhJYb XdjpkwU1ItMeg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 28 Nov 2017 21:23:23 +0900 Message-Id: <1511871803-10385-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511871803-10385-1-git-send-email-yamada.masahiro@socionext.com> References: <1511871803-10385-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 5/5] Remove assert() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" No more users of assert() except host tools. Remove. Signed-off-by: Masahiro Yamada --- include/common.h | 15 --------------- lib/tiny-printf.c | 9 --------- lib/vsprintf.c | 9 --------- 3 files changed, 33 deletions(-) diff --git a/include/common.h b/include/common.h index e14e1da..d38748f 100644 --- a/include/common.h +++ b/include/common.h @@ -76,21 +76,6 @@ typedef volatile unsigned char vu_char; #define warn_non_spl(fmt, args...) \ debug_cond(!_SPL_BUILD, fmt, ##args) -/* - * An assertion is run-time check done in debug mode only. If DEBUG is not - * defined then it is skipped. If DEBUG is defined and the assertion fails, - * then it calls panic*( which may or may not reset/halt U-Boot (see - * CONFIG_PANIC_HANG), It is hoped that all failing assertions are found - * before release, and after release it is hoped that they don't matter. But - * in any case these failing assertions cannot be fixed with a reset (which - * may just do the same assertion again). - */ -void __assert_fail(const char *assertion, const char *file, unsigned line, - const char *function); -#define assert(x) \ - ({ if (!(x) && _DEBUG) \ - __assert_fail(#x, __FILE__, __LINE__, __func__); }) - typedef void (interrupt_handler_t)(void *); #include /* boot information for Linux kernel */ diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 0b04813..d5b6d69 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -381,12 +381,3 @@ int snprintf(char *buf, size_t size, const char *fmt, ...) return ret; } - -void __assert_fail(const char *assertion, const char *file, unsigned line, - const char *function) -{ - /* This will not return */ - printf("%s:%u: %s: Assertion `%s' failed.", file, line, function, - assertion); - hang(); -} diff --git a/lib/vsprintf.c b/lib/vsprintf.c index dd572d2..4208239 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -789,15 +789,6 @@ int vprintf(const char *fmt, va_list args) return i; } - -void __assert_fail(const char *assertion, const char *file, unsigned line, - const char *function) -{ - /* This will not return */ - panic("%s:%u: %s: Assertion `%s' failed.", file, line, function, - assertion); -} - char *simple_itoa(ulong i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */