dc/779ba09964e8bf549d86acfaec9edb6cd6d55a

   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 31C2240F208\r
   6         for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 16:26:04 -0800 (PST)\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 n6MsAI2QYVxS for <notmuch@notmuchmail.org>;\r
  16         Sat,  7 Jan 2012 16:26:03 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 8CAF840A620\r
  20         for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 16:26:03 -0800 (PST)\r
  21 X-AuditID: 12074424-b7fae6d000000906-17-4f08e29bf525\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 85.6C.02310.B92E80F4; Sat,  7 Jan 2012 19:26:03 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q080Q2nd028361; \r
  27         Sat, 7 Jan 2012 19:26:02 -0500\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 q080Q10p025864\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Sat, 7 Jan 2012 19:26:01 -0500 (EST)\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 1RjgaY-0003tk-8e; Sat, 07 Jan 2012 19:26:18 -0500\r
  37 Date: Sat, 7 Jan 2012 19:26:18 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Jani Nikula <jani@nikula.org>\r
  40 Subject: Re: [RFC PATCH 3/9] lib: fix messages.c build warn\r
  41 Message-ID: <20120108002618.GA27250@mit.edu>\r
  42 References: <cover.1325977940.git.jani@nikula.org>\r
  43         <6d465c52d6ce9deef079c74389d810f944801bee.1325977940.git.jani@nikula.org>\r
  44 MIME-Version: 1.0\r
  45 Content-Type: text/plain; charset=utf-8\r
  46 Content-Disposition: inline\r
  47 Content-Transfer-Encoding: 8bit\r
  48 In-Reply-To:\r
  49  <6d465c52d6ce9deef079c74389d810f944801bee.1325977940.git.jani@nikula.org>\r
  50 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  51 X-Brightmail-Tracker:\r
  52  H4sIAAAAAAAAA+NgFprBKsWRmVeSWpSXmKPExsUixCmqrDv7EYe/wb/pbBZN050trt+cyezA\r
  53         5HHr/mt2j2erbjEHMEVx2aSk5mSWpRbp2yVwZWy8klGwnaPi/oJTLA2MH9i6GDk5JARMJF4/\r
  54         PcMOYYtJXLi3HijOxSEksI9R4sTmtYwQznpGidUzXrBAOCeYJK4vuMwC0iIksIRRYsIzoS5G\r
  55         Dg4WARWJA20BIGE2AQ2JbfuXM4LYIgKKEptP7gezmQWkJb79bmYCsYUFrCUer3vNDGLzCuhI\r
  56         PHrSwQ4xsk5iwpXv7BBxQYmTM5+wQPSqS/yZd4kZZBXInOX/OCDC8hLNW2eDjeEUCJN4+uEl\r
  57         2GOiQNdMObmNbQKj8Cwkk2YhmTQLYdIsJJMWMLKsYpRNya3SzU3MzClOTdYtTk7My0st0jXX\r
  58         y80s0UtNKd3ECIoAdheVHYzNh5QOMQpwMCrx8L7SYvcXYk0sK67MPcQoycGkJMqbep/DX4gv\r
  59         KT+lMiOxOCO+qDQntfgQowQHs5IIb+lNoBxvSmJlVWpRPkxKmoNFSZxXQ+udn5BAemJJanZq\r
  60         akFqEUxWhoNDSYLXAhjpQoJFqempFWmZOSUIaSYOTpDhPEDDv9wFGV5ckJhbnJkOkT/FqCgl\r
  61         zusK0iwAksgozYPrhSWoV4ziQK8I82qBVPEAkxtc9yugwUxAgx/8YQcZXJKIkJJqYNx9rPfW\r
  62         mc1b5nZbpQiwzO6RnN7kcP/MGd1WsX75M82eic9k2Mun7q8v/ME49f+X506zcmdcTTRi/m32\r
  63         oUHgSeQjQ0buZar/16utSMm6qpN+84OZnBzXLsvyQ0skcnnmK2ukrXmXv8SDgVVRyv7S1OCD\r
  64         zE2qZ7U+2k0q3h2S2zxzCYfZ5PCD95RYijMSDbWYi4oTAU7PoSwrAwAA\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: Sun, 08 Jan 2012 00:26:04 -0000\r
  79 \r
  80 I don't have much opinion on the other patches in this series (the C99\r
  81 variadic macro stuff is unfortunate), but this one should go in.\r
  82 \r
  83 Quoth Jani Nikula on Jan 08 at  1:26 am:\r
  84 > lib/messages.c: In function ‘notmuch_messages_move_to_next’:\r
  85 > lib/messages.c:131:2: warning: ISO C forbids ‘return’ with expression, in function returning void [-pedantic]\r
  86 > \r
  87 > Signed-off-by: Jani Nikula <jani@nikula.org>\r
  88 > ---\r
  89 >  lib/messages.c |    6 ++++--\r
  90 >  1 files changed, 4 insertions(+), 2 deletions(-)\r
  91 > \r
  92 > diff --git a/lib/messages.c b/lib/messages.c\r
  93 > index 7bcd1ab..1121864 100644\r
  94 > --- a/lib/messages.c\r
  95 > +++ b/lib/messages.c\r
  96 > @@ -127,8 +127,10 @@ notmuch_messages_get (notmuch_messages_t *messages)\r
  97 >  void\r
  98 >  notmuch_messages_move_to_next (notmuch_messages_t *messages)\r
  99 >  {\r
 100 > -    if (! messages->is_of_list_type)\r
 101 > -     return _notmuch_mset_messages_move_to_next (messages);\r
 102 > +    if (! messages->is_of_list_type) {\r
 103 > +     _notmuch_mset_messages_move_to_next (messages);\r
 104 > +     return;\r
 105 > +    }\r
 106 >  \r
 107 >      if (messages->iterator == NULL)\r
 108 >       return;\r