1 Return-Path: <m.walters@qmul.ac.uk>
\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 3EB58431FAF
\r
6 for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 00:42:18 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5
\r
12 tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,
\r
13 NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id B2+uEkiYoj1Z for <notmuch@notmuchmail.org>;
\r
17 Sun, 22 Apr 2012 00:42:16 -0700 (PDT)
\r
18 Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 9705A431FAE
\r
22 for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 00:42:16 -0700 (PDT)
\r
23 Received: from smtp.qmul.ac.uk ([138.37.6.40])
\r
24 by mail2.qmul.ac.uk with esmtp (Exim 4.71)
\r
25 (envelope-from <m.walters@qmul.ac.uk>)
\r
26 id 1SLrR0-0004Hf-LQ; Sun, 22 Apr 2012 08:42:14 +0100
\r
27 Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]
\r
29 by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)
\r
30 (envelope-from <m.walters@qmul.ac.uk>)
\r
31 id 1SLrR0-00000x-9h; Sun, 22 Apr 2012 08:42:14 +0100
\r
32 From: Mark Walters <markwalters1009@gmail.com>
\r
33 To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
\r
34 Subject: Re: [PATCH v2 4/4] new: Fix missing end_atomic in remove_filename on
\r
36 In-Reply-To: <1335068868-12593-5-git-send-email-amdragon@mit.edu>
\r
37 References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>
\r
38 <1335068868-12593-1-git-send-email-amdragon@mit.edu>
\r
39 <1335068868-12593-5-git-send-email-amdragon@mit.edu>
\r
40 User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1
\r
41 (x86_64-pc-linux-gnu)
\r
42 Date: Sun, 22 Apr 2012 08:42:34 +0100
\r
43 Message-ID: <877gx8kyad.fsf@qmul.ac.uk>
\r
45 Content-Type: text/plain; charset=us-ascii
\r
46 X-Sender-Host-Address: 94.192.233.223
\r
47 X-QM-SPAM-Info: Sender has good ham record. :)
\r
48 X-QM-Body-MD5: e84890b7daac992a5a6cdc69cd748415 (of first 20000 bytes)
\r
49 X-SpamAssassin-Score: -1.8
\r
50 X-SpamAssassin-SpamBar: -
\r
51 X-SpamAssassin-Report: The QM spam filters have analysed this message to
\r
53 spam. We require at least 5.0 points to mark a message as spam.
\r
54 This message scored -1.8 points.
\r
55 Summary of the scoring:
\r
56 * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,
\r
58 * [138.37.6.40 listed in list.dnswl.org]
\r
59 * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
\r
60 provider * (markwalters1009[at]gmail.com)
\r
61 * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay
\r
63 * 0.5 AWL AWL: From: address is in the auto white-list
\r
64 X-QM-Scan-Virus: ClamAV says the message is clean
\r
65 X-BeenThere: notmuch@notmuchmail.org
\r
66 X-Mailman-Version: 2.1.13
\r
68 List-Id: "Use and development of the notmuch mail system."
\r
69 <notmuch.notmuchmail.org>
\r
70 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
71 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
72 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
73 List-Post: <mailto:notmuch@notmuchmail.org>
\r
74 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
75 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
76 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
77 X-List-Received-Date: Sun, 22 Apr 2012 07:42:18 -0000
\r
79 On Sun, 22 Apr 2012, Austin Clements <amdragon@MIT.EDU> wrote:
\r
80 > Previously, if we failed to find the message by filename in
\r
81 > remove_filename, we would return immediately from the function without
\r
82 > ending its atomic block. Now this code follows the usual goto DONE
\r
83 > idiom to perform cleanup.
\r
85 The whole series looks good to me modulo the return value in Patch 2/4.
\r
92 > notmuch-new.c | 5 ++++-
\r
93 > 1 files changed, 4 insertions(+), 1 deletions(-)
\r
95 > diff --git a/notmuch-new.c b/notmuch-new.c
\r
96 > index 2103b18..9eebea4 100644
\r
97 > --- a/notmuch-new.c
\r
98 > +++ b/notmuch-new.c
\r
99 > @@ -779,7 +779,8 @@ remove_filename (notmuch_database_t *notmuch,
\r
101 > status = notmuch_database_find_message_by_filename (notmuch, path, &message);
\r
102 > if (status || message == NULL)
\r
106 > status = notmuch_database_remove_message (notmuch, path);
\r
107 > if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
\r
108 > add_files_state->renamed_messages++;
\r
109 > @@ -790,6 +791,8 @@ remove_filename (notmuch_database_t *notmuch,
\r
110 > add_files_state->removed_messages++;
\r
112 > notmuch_message_destroy (message);
\r
115 > notmuch_database_end_atomic (notmuch);
\r
121 > _______________________________________________
\r
122 > notmuch mailing list
\r
123 > notmuch@notmuchmail.org
\r
124 > http://notmuchmail.org/mailman/listinfo/notmuch
\r