Re: [PATCH v2 4/4] new: Fix missing end_atomic in remove_filename on error

diff --git a/80/c393219a88fc04d64f9180bf3626aaf4655a13 b/80/c393219a88fc04d64f9180bf3626aaf4655a13
new file mode 100644 (file)
index 0000000..fb3bbea
--- /dev/null
+++ b/80/c393219a88fc04d64f9180bf3626aaf4655a13
@@ -0,0 +1,124 @@
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3EB58431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 00:42:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id B2+uEkiYoj1Z for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Apr 2012 00:42:16 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9705A431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 00:42:16 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SLrR0-0004Hf-LQ; Sun, 22 Apr 2012 08:42:14 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SLrR0-00000x-9h; Sun, 22 Apr 2012 08:42:14 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 4/4] new: Fix missing end_atomic in remove_filename on\r
+       error\r
+In-Reply-To: <1335068868-12593-5-git-send-email-amdragon@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+       <1335068868-12593-1-git-send-email-amdragon@mit.edu>\r
+       <1335068868-12593-5-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 22 Apr 2012 08:42:34 +0100\r
+Message-ID: <877gx8kyad.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: e84890b7daac992a5a6cdc69cd748415 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 22 Apr 2012 07:42:18 -0000\r
+\r
+On Sun, 22 Apr 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Previously, if we failed to find the message by filename in\r
+> remove_filename, we would return immediately from the function without\r
+> ending its atomic block.  Now this code follows the usual goto DONE\r
+> idiom to perform cleanup.\r
+\r
+The whole series looks good to me modulo the return value in Patch 2/4.\r
+\r
+Best wishes\r
+\r
+Mark \r
+\r
+> ---\r
+>  notmuch-new.c |    5 ++++-\r
+>  1 files changed, 4 insertions(+), 1 deletions(-)\r
+>\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index 2103b18..9eebea4 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -779,7 +779,8 @@ remove_filename (notmuch_database_t *notmuch,\r
+>      return status;\r
+>      status = notmuch_database_find_message_by_filename (notmuch, path, &message);\r
+>      if (status || message == NULL)\r
+> -    return status;\r
+> +    goto DONE;\r
+> +\r
+>      status = notmuch_database_remove_message (notmuch, path);\r
+>      if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {\r
+>      add_files_state->renamed_messages++;\r
+> @@ -790,6 +791,8 @@ remove_filename (notmuch_database_t *notmuch,\r
+>      add_files_state->removed_messages++;\r
+>      }\r
+>      notmuch_message_destroy (message);\r
+> +\r
+> +  DONE:\r
+>      notmuch_database_end_atomic (notmuch);\r
+>      return status;\r
+>  }\r
+> -- \r
+> 1.7.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r