Attachment 918491 Details for Bug 1105335 – better patch

[patch] better patch

0001-assert.h-allow-gcc-to-detect-assert-a-1-errors.patch.txt (text/plain), 1.72 KB, created by Jim Meyering on 2014-07-16 17:39:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Meyering

Created: 2014-07-16 17:39:31 UTC

Size: 1.72 KB

patch

obsolete

>From 680167940dc958dbcfbe4459a96ad54206dc56c7 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.
>---
> assert/assert.h | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
>diff --git a/assert/assert.h b/assert/assert.h
>index 2661391..90a52e8 100644
>--- a/assert/assert.h
>+++ b/assert/assert.h
>@@ -82,10 +82,23 @@ 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, define assert so that it does not add extra
>+   parentheses around EXPR.  Otherwise, those added parentheses would
>+   suppress warnings otherwise detected by gcc's -Wparentheses.  */
>+# if  !defined __GNUC__ || defined __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);\
>+    })
>+# endif
> 
> # ifdef	__USE_GNU
> #  define assert_perror(errnum)						\
>-- 
>1.8.1
>

Actions: View | Diff

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