1 Return-Path: <teythoon@jade-hamburg.de>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 5C425431FC4
\r
6 for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 08:21:47 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id w-vAk+IJFocf for <notmuch@notmuchmail.org>;
\r
16 Mon, 24 Sep 2012 08:21:45 -0700 (PDT)
\r
17 Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])
\r
18 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 7DBA7429E26
\r
21 for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 08:21:43 -0700 (PDT)
\r
22 Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])
\r
23 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
24 (No client certificate requested)
\r
25 by mail.cryptobitch.de (Postfix) with ESMTPSA id 47A5E5AB282
\r
26 for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 17:21:42 +0200 (CEST)
\r
27 Received: by mail.jade-hamburg.de (Postfix, from userid 401)
\r
28 id BA339DF2A2; Mon, 24 Sep 2012 17:21:41 +0200 (CEST)
\r
29 Received: from thinkbox.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])
\r
30 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
31 (No client certificate requested) (Authenticated sender: teythoon)
\r
32 by mail.jade-hamburg.de (Postfix) with ESMTPSA id 14B42DF2A4;
\r
33 Mon, 24 Sep 2012 17:21:32 +0200 (CEST)
\r
34 Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.80)
\r
35 (envelope-from <teythoon@thinkbox.jade-hamburg.de>)
\r
36 id 1TGATQ-0007lF-Vb; Mon, 24 Sep 2012 17:21:28 +0200
\r
37 From: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 4/6] Fix the COERCE_STATUS macro
\r
40 Date: Mon, 24 Sep 2012 17:21:18 +0200
\r
42 <1348500080-29726-4-git-send-email-4winter@informatik.uni-hamburg.de>
\r
43 X-Mailer: git-send-email 1.7.10.4
\r
45 <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
46 References: <873927eb5i.fsf@convex-new.cs.unb.ca>
\r
47 <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Mon, 24 Sep 2012 15:21:47 -0000
\r
62 Fix the COERCE_STATUS macro to handle _internal_error being declared
\r
65 Note that the function _internal_error does not return. Evaluating to
\r
66 NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler.
\r
68 Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
70 lib/notmuch-private.h | 10 +++++++---
\r
71 1 file changed, 7 insertions(+), 3 deletions(-)
\r
73 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
\r
74 index bfb4111..7a409f5 100644
\r
75 --- a/lib/notmuch-private.h
\r
76 +++ b/lib/notmuch-private.h
\r
77 @@ -136,13 +136,17 @@ typedef enum _notmuch_private_status {
\r
78 * to or greater than NOTMUCH_STATUS_LAST_STATUS. (The idea here is
\r
79 * that the caller has previously handled any expected
\r
80 * notmuch_private_status_t values.)
\r
82 + * Note that the function _internal_error does not return. Evaluating
\r
83 + * to NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler.
\r
85 #define COERCE_STATUS(private_status, format, ...) \
\r
86 ((private_status >= (notmuch_private_status_t) NOTMUCH_STATUS_LAST_STATUS)\
\r
88 - (notmuch_status_t) _internal_error (format " (%s).\n", \
\r
91 + _internal_error (format " (%s).\n", \
\r
94 + (notmuch_status_t) NOTMUCH_PRIVATE_STATUS_SUCCESS \
\r
96 (notmuch_status_t) private_status)
\r