From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Mon, 24 Sep 2012 15:21:18 +0000 (+0200) Subject: [PATCH 4/6] Fix the COERCE_STATUS macro X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cab687247334469d3e1f3d48b0e1a38f0694738f;p=notmuch-archives.git [PATCH 4/6] Fix the COERCE_STATUS macro --- diff --git a/6f/c44e0fb7ecb2fa42cc2329f2e4b26e13df9903 b/6f/c44e0fb7ecb2fa42cc2329f2e4b26e13df9903 new file mode 100644 index 000000000..f40943462 --- /dev/null +++ b/6f/c44e0fb7ecb2fa42cc2329f2e4b26e13df9903 @@ -0,0 +1,100 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5C425431FC4 + for ; Mon, 24 Sep 2012 08:21:47 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id w-vAk+IJFocf for ; + Mon, 24 Sep 2012 08:21:45 -0700 (PDT) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7DBA7429E26 + for ; Mon, 24 Sep 2012 08:21:43 -0700 (PDT) +Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id 47A5E5AB282 + for ; Mon, 24 Sep 2012 17:21:42 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id BA339DF2A2; Mon, 24 Sep 2012 17:21:41 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id 14B42DF2A4; + Mon, 24 Sep 2012 17:21:32 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.80) + (envelope-from ) + id 1TGATQ-0007lF-Vb; Mon, 24 Sep 2012 17:21:28 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 4/6] Fix the COERCE_STATUS macro +Date: Mon, 24 Sep 2012 17:21:18 +0200 +Message-Id: + <1348500080-29726-4-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: + <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <873927eb5i.fsf@convex-new.cs.unb.ca> + <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 24 Sep 2012 15:21:47 -0000 + +Fix the COERCE_STATUS macro to handle _internal_error being declared +as void function. + +Note that the function _internal_error does not return. Evaluating to +NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler. + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + lib/notmuch-private.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index bfb4111..7a409f5 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -136,13 +136,17 @@ typedef enum _notmuch_private_status { + * to or greater than NOTMUCH_STATUS_LAST_STATUS. (The idea here is + * that the caller has previously handled any expected + * notmuch_private_status_t values.) ++ * ++ * Note that the function _internal_error does not return. Evaluating ++ * to NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler. + */ + #define COERCE_STATUS(private_status, format, ...) \ + ((private_status >= (notmuch_private_status_t) NOTMUCH_STATUS_LAST_STATUS)\ + ? \ +- (notmuch_status_t) _internal_error (format " (%s).\n", \ +- ##__VA_ARGS__, \ +- __location__) \ ++ _internal_error (format " (%s).\n", \ ++ ##__VA_ARGS__, \ ++ __location__), \ ++ (notmuch_status_t) NOTMUCH_PRIVATE_STATUS_SUCCESS \ + : \ + (notmuch_status_t) private_status) + +-- +1.7.10.4 +