Attachment 914882 Details for Bug 1105335 – assert: fix its definition not to disable -Wparentheses

[patch] assert: fix its definition not to disable -Wparentheses

0001-assert.h-allow-gcc-to-detect-assert-a-1-errors.patch (text/plain), 2.39 KB, created by Jim Meyering on 2014-07-05 22:31:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Meyering

Created: 2014-07-05 22:31:54 UTC

Size: 2.39 KB

patch

obsolete

>From df09d47c4bb0ecf0a891488e03757d99a9a5f8e3 Mon Sep 17 00:00:00 2001
>From: Jim Meyering <meyering@fb.com>
>Date: Thu, 5 Jun 2014 10:42:05 -0700
>Subject: [PATCH] assert.h: allow gcc to detect assert(a = 1) errors
>
>* assert/assert.h (assert): Rewrite assert's definition so that
>a s/==/=/ typo, e.g., assert(errno = ENOENT) is not hidden from
>gcc's -Wparentheses by the parentheses added by assert.
>The new definition uses "if (expr) ; else __assert_fail...", so
>gcc -Wall will now detect that type of error in an assert, too.
>---
> ChangeLog       |  9 +++++++++
> assert/assert.h | 22 ++++++++++++++++++----
> 2 files changed, 27 insertions(+), 4 deletions(-)
>
>diff --git a/ChangeLog b/ChangeLog
>index 17f0c83..ed58f9f 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2014-06-05  Jim Meyering  <meyering@fb.com>
>+
>+	[BZ # 1105335]
>+	* assert/assert.h (assert): Rewrite assert's definition so that
>+	a s/==/=/ typo, e.g., assert(errno = ENOENT) is not hidden from
>+	gcc's -Wparentheses by the parentheses added by assert.
>+	The new definition uses "if (expr) ; else __assert_fail...", so
>+	gcc -Wall will now detect that type of error in an assert, too.
>+
> 2014-06-05  OndÅej BÃlka  <neleai@seznam.cz>
> 
> 	[BZ #15698]
>diff --git a/assert/assert.h b/assert/assert.h
>index 2661391..3fc1e84 100644
>--- a/assert/assert.h
>+++ b/assert/assert.h
>@@ -82,10 +82,24 @@ extern void __assert (const char *__assertion, const char *__file, int __line)
> 
> __END_DECLS
> 
>-# define assert(expr)							\
>-  ((expr)								\
>-   ? __ASSERT_VOID_CAST (0)						\
>-   : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
>+/* When possible (without __STRICT_ANSI__), define assert in a way
>+   that does not add extra parentheses around EXPR.  Otherwise, those
>+   added parentheses would suppress warnings otherwise detected by
>+   gcc's -Wparentheses.  */
>+# ifdef __STRICT_ANSI__
>+#  define assert(expr)							\
>+    ((expr)                                                             \
>+     ? __ASSERT_VOID_CAST (0)                                           \
>+     : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
>+# else
>+#  define assert(expr)							\
>+    ({									\
>+      if (expr)								\
>+        ; /* empty */							\
>+      else								\
>+        __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION);\
>+    })
>+# fi
> 
> # ifdef	__USE_GNU
> #  define assert_perror(errnum)						\
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 1105335: 902693 | 902724 | 914882 | 918486 | 918491 | 918554 | 1223507