58/1f1dcebb89cd282483f219af508a8972f8bdac

   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 CBEB9431FC3\r
   6         for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:27:56 -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 jTw53mOJA5rO for <notmuch@notmuchmail.org>;\r
  16         Sat, 21 Apr 2012 21:27:56 -0700 (PDT)\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 03826431FAF\r
  20         for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 21:27:55 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7fae6d000000906-78-4f9388cb3ab5\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 4F.AB.02310.BC8839F4; Sun, 22 Apr 2012 00:27:55 -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 q3M4RtcF019371; \r
  27         Sun, 22 Apr 2012 00:27:55 -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 q3M4Rs5P011066\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 22 Apr 2012 00:27:54 -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 1SLoOw-0003IF-12; Sun, 22 Apr 2012 00:27:54 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 4/4] new: Fix missing end_atomic in remove_filename on\r
  41  error\r
  42 Date: Sun, 22 Apr 2012 00:27:48 -0400\r
  43 Message-Id: <1335068868-12593-5-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.9.1\r
  45 In-Reply-To: <1335068868-12593-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
  47         <1335068868-12593-1-git-send-email-amdragon@mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrnu6Y7K/wbcnshbXb85kdmD0eLbq\r
  50         FnMAYxSXTUpqTmZZapG+XQJXRt/6I6wFRzgqnh95ytbA+Imti5GTQ0LARGLBnAtMELaYxIV7\r
  51         64HiXBxCAvsYJS5MnM4C4WxglJi7fy+Uc59JYufli6wQznxGic2HtrGD9LMJaEhs27+cEcQW\r
  52         EZCW2Hl3NlARBwezgJrEny4VkLCwgL/EhylzWUBsFgFVidPHnzGD2LwCDhLNW+6xQpyhIPFs\r
  53         3XGwkzgFHCUWvzwONlJIoEyi6eUyxgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpmuvl\r
  54         ZpbopaaUbmIEh42Lyg7G5kNKhxgFOBiVeHhfmUz2F2JNLCuuzD3EKMnBpCTKq18JFOJLyk+p\r
  55         zEgszogvKs1JLT7EKMHBrCTC+1kEKMebklhZlVqUD5OS5mBREufV0HrnJySQnliSmp2aWpBa\r
  56         BJOV4eBQkuBtAMaHkGBRanpqRVpmTglCmomDE2Q4D9Dw5+0gw4sLEnOLM9Mh8qcYFaXEeUVA\r
  57         mgVAEhmleXC9sLh+xSgO9IowbzZIFQ8wJcB1vwIazAQ0OCFmEsjgkkSElFQD42q9jfoP9+1Q\r
  58         ajVKrJz2asUGoR9bev9+t+b5cv55tO3ht9F3tdXezJ2exTPNLiVZ+Ij5+WVR16eKZ2ofddX+\r
  59         cSj+xyKNzeunB83W//YzR7b4JsunnZMDr4dINxoXCboaM57tUQ6YX8fuOfXMmwsik/Rf3tt9\r
  60         zGTlCU6WykRe790m+UqR+255HFNiKc5INNRiLipOBABOl5KWxgIAAA==\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 04:27:57 -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 2103b18..9eebea4 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