4e/c86f2714a9422b94b5e43b0284b83f9376a778

   1 Return-Path: <amthrax@drake.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 5AFE9431FB6\r
   6         for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:51:00 -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 xa6cSWzGXZZj for <notmuch@notmuchmail.org>;\r
  16         Sun, 22 Apr 2012 08:50:59 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id E2E2A431FAE\r
  20         for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:50:58 -0700 (PDT)\r
  21 X-AuditID: 1209190d-b7fbf6d0000008ba-a0-4f9428e2cf72\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id EE.83.02234.2E8249F4; Sun, 22 Apr 2012 11:50:58 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q3MFovEf023025; \r
  27         Sun, 22 Apr 2012 11:50:57 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3MFou5B003695\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 22 Apr 2012 11:50:57 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1SLz3w-0002fJ-Ni; Sun, 22 Apr 2012 11:50:56 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v3 4/4] new: Fix missing end_atomic in remove_filename on\r
  41  error\r
  42 Date: Sun, 22 Apr 2012 11:50:52 -0400\r
  43 Message-Id: <1335109852-10150-5-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.9.1\r
  45 In-Reply-To: <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
  47         <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrvtIY4q/wbYOHYvrN2cyOzB6PFt1\r
  50         izmAMYrLJiU1J7MstUjfLoErY8LfR4wFRzgqjr/7y9rA+Imti5GTQ0LAROLPm81QtpjEhXvr\r
  51         gWwuDiGBfYwSh198gHI2MErMWv6RGcK5zyRx+vVmKGc+o8TGFRfZQfrZBDQktu1fzghiiwhI\r
  52         S+y8O5u1i5GDg1lATeJPlwpIWFjAX2LP7WawEhYBVYn+9p2sIDavgIPE2jU9rBBnKEg8W3ec\r
  53         CcTmFHCU+PhuJZgtJFAm8W3eW/YJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrp5WaW\r
  54         6KWmlG5iBIUNpyTvDsZ3B5UOMQpwMCrx8L40mewvxJpYVlyZe4hRkoNJSZTXTW2KvxBfUn5K\r
  55         ZUZicUZ8UWlOavEhRgkOZiUR3s8iQOW8KYmVValF+TApaQ4WJXFeVa13fkIC6YklqdmpqQWp\r
  56         RTBZGQ4OJQlec2B8CAkWpaanVqRl5pQgpJk4OEGG8wANtwap4S0uSMwtzkyHyJ9iVJQS51UG\r
  57         SQiAJDJK8+B6YXH9ilEc6BVh3hCQKh5gSoDrfgU0mAlocELMJJDBJYkIKakGxuvLOSUnLTXW\r
  58         LH8tVp4x9X3cNdETC2SjNl9d3xpbmqBxzeZNh+zubdqGijf2VbIbdKxb+DnvweJH+svdn15V\r
  59         V/uUybjU9NqcNIff/lck1r69u5/bxdeIt2xRfEdDybSCA5lJC5n2TTGe+e/n3/T0j/6q/pOn\r
  60         emzOFT4dt69SKP3NzLtHn/8y+K/EUpyRaKjFXFScCACwV9RzxgIAAA==\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Sun, 22 Apr 2012 15:51:00 -0000\r
  74 \r
  75 Previously, if we failed to find the message by filename in\r
  76 remove_filename, we would return immediately from the function without\r
  77 ending its atomic block.  Now this code follows the usual goto DONE\r
  78 idiom to perform cleanup.\r
  79 ---\r
  80  notmuch-new.c |    5 ++++-\r
  81  1 files changed, 4 insertions(+), 1 deletions(-)\r
  82 \r
  83 diff --git a/notmuch-new.c b/notmuch-new.c\r
  84 index bf9b120..473201e 100644\r
  85 --- a/notmuch-new.c\r
  86 +++ b/notmuch-new.c\r
  87 @@ -779,7 +779,8 @@ remove_filename (notmuch_database_t *notmuch,\r
  88         return status;\r
  89      status = notmuch_database_find_message_by_filename (notmuch, path, &message);\r
  90      if (status || message == NULL)\r
  91 -       return status;\r
  92 +       goto DONE;\r
  93 +\r
  94      status = notmuch_database_remove_message (notmuch, path);\r
  95      if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {\r
  96         add_files_state->renamed_messages++;\r
  97 @@ -790,6 +791,8 @@ remove_filename (notmuch_database_t *notmuch,\r
  98         add_files_state->removed_messages++;\r
  99      }\r
 100      notmuch_message_destroy (message);\r
 101 +\r
 102 +  DONE:\r
 103      notmuch_database_end_atomic (notmuch);\r
 104      return status;\r
 105  }\r
 106 -- \r
 107 1.7.9.1\r
 108 \r