[PATCH 1/2] Annotate internal_error with the attribute noreturn

diff --git a/a2/04fa60ccc2c298ddb35fb47649bacc69917073 b/a2/04fa60ccc2c298ddb35fb47649bacc69917073
new file mode 100644 (file)
index 0000000..bad4a93
--- /dev/null
+++ b/a2/04fa60ccc2c298ddb35fb47649bacc69917073
@@ -0,0 +1,100 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 19356431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Sep 2012 05:50:54 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id hRB5NkDDRnXE for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Sep 2012 05:50:53 -0700 (PDT)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0A932431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Sep 2012 05:50:53 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 9F9B85AB092\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Sep 2012 14:50:51 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 19ECCDF2A4; Fri, 21 Sep 2012 14:50:51 +0200 (CEST)\r
+Received: from thinkbox.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id E81B5DF2A2;\r
+       Fri, 21 Sep 2012 14:50:47 +0200 (CEST)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.80)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1TF2gv-0005fI-Bd; Fri, 21 Sep 2012 14:50:45 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] Annotate internal_error with the attribute noreturn\r
+Date: Fri, 21 Sep 2012 14:50:36 +0200\r
+Message-Id:\r
+ <1348231837-21700-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 21 Sep 2012 12:50:54 -0000\r
+\r
+Annotating functions that do not return with the noreturn attribute\r
+(which is understood by both gcc and clang) prevents static analyzers\r
+from generating false positives (internal_error is used to terminate\r
+the process and is used extensively in error handling code paths).\r
+\r
+Remove the return statement that was placed there to appease the\r
+compiler. Functions annotated with noreturn are not supposed to return\r
+any values.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ util/error_util.c |    2 --\r
+ util/error_util.h |    2 +-\r
+ 2 files changed, 1 insertion(+), 3 deletions(-)\r
+\r
+diff --git a/util/error_util.c b/util/error_util.c\r
+index 630d228..3cf353a 100644\r
+--- a/util/error_util.c\r
++++ b/util/error_util.c\r
+@@ -35,7 +35,5 @@ _internal_error (const char *format, ...)\r
+     vfprintf (stderr, format, va_args);\r
+ \r
+     exit (1);\r
+-\r
+-    return 1;\r
+ }\r
+ \r
+diff --git a/util/error_util.h b/util/error_util.h\r
+index bb15822..24a644b 100644\r
+--- a/util/error_util.h\r
++++ b/util/error_util.h\r
+@@ -30,7 +30,7 @@\r
+  * Note that PRINTF_ATTRIBUTE comes from talloc.h\r
+  */\r
+ int\r
+-_internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2);\r
++_internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2) __attribute__ ((noreturn));\r
+ \r
+ /* There's no point in continuing when we've detected that we've done\r
+  * something wrong internally (as opposed to the user passing in a\r
+-- \r
+1.7.10.4\r
+\r