1b/5fb44801fef4dcbf748a0617ea18f6c67215e1

   1 Return-Path: <amdragon@mit.edu>\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 ECF6F431FC0\r
   6         for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 10:45:02 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 dhKqUfCmZEmM for <notmuch@notmuchmail.org>;\r
  16         Mon, 24 Sep 2012 10:45:01 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 72918431FAF\r
  20         for <notmuch@notmuchmail.org>; Mon, 24 Sep 2012 10:45:01 -0700 (PDT)\r
  21 X-AuditID: 1209190c-b7f286d000000ee3-71-50609c1c9b2c\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 5C.E5.03811.C1C90605; Mon, 24 Sep 2012 13:45:00 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q8OHixLD005335; \r
  27         Mon, 24 Sep 2012 13:45:00 -0400\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q8OHivf5015432\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Mon, 24 Sep 2012 13:44:58 -0400 (EDT)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TGCiH-0004Uv-9k; Mon, 24 Sep 2012 13:44:57 -0400\r
  37 Date: Mon, 24 Sep 2012 13:44:57 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Justus Winter <4winter@informatik.uni-hamburg.de>\r
  40 Subject: Re: [PATCH 4/6] Fix the COERCE_STATUS macro\r
  41 Message-ID: <20120924174457.GK26662@mit.edu>\r
  42 References: <873927eb5i.fsf@convex-new.cs.unb.ca>\r
  43         <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
  44         <1348500080-29726-4-git-send-email-4winter@informatik.uni-hamburg.de>\r
  45 MIME-Version: 1.0\r
  46 Content-Type: text/plain; charset=us-ascii\r
  47 Content-Disposition: inline\r
  48 In-Reply-To:\r
  49  <1348500080-29726-4-git-send-email-4winter@informatik.uni-hamburg.de>\r
  50 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  51 X-Brightmail-Tracker:\r
  52  H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42IRYrdT0ZWZkxBg8OKLtcXs1h9MFtdvzmR2\r
  53         YPKYeP40m8ezVbeYA5iiuGxSUnMyy1KL9O0SuDK+z9rHWtDEVzG39S1bA+NCri5GDg4JAROJ\r
  54         XU9cuhg5gUwxiQv31rN1MXJxCAnsY5TY9nEfC4SzgVGi789zqMxJJonvn/uYIZwljBJnvn1h\r
  55         BelnEVCVmLrlCiOIzSagIbFt/3IwW0TAVGLDgwfsIDazgLTEt9/NTCC2MNDqw9vbwWxeAR2J\r
  56         j99nskIMPcgo0fjhJCNEQlDi5MwnLBDNWhI3/r1kArkbZNDyfxwgYU6BIImvXb1g80UFVCSm\r
  57         nNzGNoFRaBaS7llIumchdC9gZF7FKJuSW6Wbm5iZU5yarFucnJiXl1qka6iXm1mil5pSuokR\r
  58         FNickjw7GN8cVDrEKMDBqMTDe6M1IUCINbGsuDL3EKMkB5OSKK/vdKAQX1J+SmVGYnFGfFFp\r
  59         TmrxIUYJDmYlEd4rXUA53pTEyqrUonyYlDQHi5I47+WUm/5CAumJJanZqakFqUUwWRkODiUJ\r
  60         3puzgBoFi1LTUyvSMnNKENJMHJwgw3mAhvPPBhleXJCYW5yZDpE/xagoJc77CqRZACSRUZoH\r
  61         1wtLPK8YxYFeEeblBWnnASYtuO5XQIOZQAbviQMZXJKIkJJqYEz+ey65TmBhvk7R7AXXV31l\r
  62         YNHL+nO0LHTGeVbu39edhNs+iGnfr/QMZ2Gb87hbYO9U2fDezRZBCcs49ON39b1NtUkLrQph\r
  63         3Jcy5+p7Y5vayIRb3jMDrZ3dd9x2iLVuPLd6vUq64bUnE2zUVJhtJ044IvqD78HfaetjFzR8\r
  64         /flwyvq8i6WFaUosxRmJhlrMRcWJAInNM+UXAwAA\r
  65 Cc: notmuch@notmuchmail.org\r
  66 X-BeenThere: notmuch@notmuchmail.org\r
  67 X-Mailman-Version: 2.1.13\r
  68 Precedence: list\r
  69 List-Id: "Use and development of the notmuch mail system."\r
  70         <notmuch.notmuchmail.org>\r
  71 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  73 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  74 List-Post: <mailto:notmuch@notmuchmail.org>\r
  75 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  76 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  77         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  78 X-List-Received-Date: Mon, 24 Sep 2012 17:45:03 -0000\r
  79 \r
  80 Quoth Justus Winter on Sep 24 at  5:21 pm:\r
  81 > Fix the COERCE_STATUS macro to handle _internal_error being declared\r
  82 > as void function.\r
  83 > \r
  84 > Note that the function _internal_error does not return. Evaluating to\r
  85 > NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler.\r
  86 > \r
  87 > Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
  88 > ---\r
  89 >  lib/notmuch-private.h |   10 +++++++---\r
  90 >  1 file changed, 7 insertions(+), 3 deletions(-)\r
  91 > \r
  92 > diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
  93 > index bfb4111..7a409f5 100644\r
  94 > --- a/lib/notmuch-private.h\r
  95 > +++ b/lib/notmuch-private.h\r
  96 > @@ -136,13 +136,17 @@ typedef enum _notmuch_private_status {\r
  97 >   * to or greater than NOTMUCH_STATUS_LAST_STATUS. (The idea here is\r
  98 >   * that the caller has previously handled any expected\r
  99 >   * notmuch_private_status_t values.)\r
 100 > + *\r
 101 > + * Note that the function _internal_error does not return. Evaluating\r
 102 > + * to NOTMUCH_STATUS_SUCCESS is done purely to appease the compiler.\r
 103 >   */\r
 104 >  #define COERCE_STATUS(private_status, format, ...)                   \\r
 105 >      ((private_status >= (notmuch_private_status_t) NOTMUCH_STATUS_LAST_STATUS)\\r
 106 >       ?                                                                       \\r
 107 > -     (notmuch_status_t) _internal_error (format " (%s).\n",          \\r
 108 > -                                         ##__VA_ARGS__,                      \\r
 109 > -                                         __location__)                       \\r
 110 > +     _internal_error (format " (%s).\n",                             \\r
 111 > +                      ##__VA_ARGS__,                                 \\r
 112 > +                      __location__),                                 \\r
 113 > +     (notmuch_status_t) NOTMUCH_PRIVATE_STATUS_SUCCESS                       \\r
 114 \r
 115 Just a nit: why not simply NOTMUCH_STATUS_SUCCESS?\r
 116 \r
 117 Otherwise, this series LGTM.  No need to roll another version just for\r
 118 this comment.\r
 119 \r
 120 >       :                                                                       \\r
 121 >       (notmuch_status_t) private_status)\r
 122 >  \r