[PATCH 4/6] Fix the COERCE_STATUS macro

diff --git a/6f/c44e0fb7ecb2fa42cc2329f2e4b26e13df9903 b/6f/c44e0fb7ecb2fa42cc2329f2e4b26e13df9903
new file mode 100644 (file)
index 0000000..f409434
--- /dev/null
+++ b/6f/c44e0fb7ecb2fa42cc2329f2e4b26e13df9903
@@ -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 5C425431FC4\r
+       for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 08:21:47 -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 w-vAk+IJFocf for <notmuch@notmuchmail.org>;\r
+       Mon, 24 Sep 2012 08:21:45 -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 7DBA7429E26\r
+       for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 08:21:43 -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 47A5E5AB282\r
+       for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 17:21:42 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id BA339DF2A2; Mon, 24 Sep 2012 17:21:41 +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 14B42DF2A4;\r
+       Mon, 24 Sep 2012 17:21:32 +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 1TGATQ-0007lF-Vb; Mon, 24 Sep 2012 17:21:28 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/6] Fix the COERCE_STATUS macro\r
+Date: Mon, 24 Sep 2012 17:21:18 +0200\r
+Message-Id:\r
+ <1348500080-29726-4-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To:\r
+ <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References: <873927eb5i.fsf@convex-new.cs.unb.ca>\r
+       <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de>\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: Mon, 24 Sep 2012 15:21:47 -0000\r
+\r
+Fix the COERCE_STATUS macro to handle _internal_error being declared\r
+as void function.\r
+\r
+Note that the function _internal_error does not return. Evaluating to\r
+NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ lib/notmuch-private.h |   10 +++++++---\r
+ 1 file changed, 7 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index bfb4111..7a409f5 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -136,13 +136,17 @@ typedef enum _notmuch_private_status {\r
+  * to or greater than NOTMUCH_STATUS_LAST_STATUS. (The idea here is\r
+  * that the caller has previously handled any expected\r
+  * notmuch_private_status_t values.)\r
++ *\r
++ * Note that the function _internal_error does not return. Evaluating\r
++ * to NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler.\r
+  */\r
+ #define COERCE_STATUS(private_status, format, ...)                    \\r
+     ((private_status >= (notmuch_private_status_t) NOTMUCH_STATUS_LAST_STATUS)\\r
+      ?                                                                        \\r
+-     (notmuch_status_t) _internal_error (format " (%s).\n",           \\r
+-                                         ##__VA_ARGS__,                       \\r
+-                                         __location__)                        \\r
++     _internal_error (format " (%s).\n",                              \\r
++                      ##__VA_ARGS__,                                  \\r
++                      __location__),                                  \\r
++     (notmuch_status_t) NOTMUCH_PRIVATE_STATUS_SUCCESS                        \\r
+      :                                                                        \\r
+      (notmuch_status_t) private_status)\r
+ \r
+-- \r
+1.7.10.4\r
+\r