Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 1D240429E32 for ; Sat, 11 Jun 2011 13:05:31 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BklDiLdbokBO for ; Sat, 11 Jun 2011 13:05:30 -0700 (PDT) Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU [18.9.25.14]) by olra.theworths.org (Postfix) with ESMTP id 9EF65429E2F for ; Sat, 11 Jun 2011 13:05:30 -0700 (PDT) X-AuditID: 1209190e-b7c39ae000000a8c-d9-4df3ca78ed55 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id 3F.6A.02700.87AC3FD4; Sat, 11 Jun 2011 16:05:12 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id p5BK5TtP014967; Sat, 11 Jun 2011 16:05:29 -0400 Received: from drake.mit.edu (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p5BK5Sun005840 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sat, 11 Jun 2011 16:05:29 -0400 (EDT) Received: from amthrax by drake.mit.edu with local (Exim 4.76) (envelope-from ) id 1QVUQy-0000HZ-H1; Sat, 11 Jun 2011 16:05:28 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 03/17] lib: Add missing status check in _notmuch_message_remove_filename. Date: Sat, 11 Jun 2011 16:04:29 -0400 Message-Id: <1307822683-848-4-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu> References: <87ei34rnc5.fsf@yoom.home.cworth.org> <1307822683-848-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrFtx6rOvwd6jlhbXb85kdmD0eLbq FnMAYxSXTUpqTmZZapG+XQJXxu3WaWwFC9gqrr6bzdrA+Ieli5GDQ0LAROLqKpUuRk4gU0zi wr31bF2MXBxCAvsYJToWbWKHcDYwSvy5cIQVwrnPJLFq8idmCGc+o8SJGQdYQfrZBDQktu1f zghiiwhIS+y8O5sVZAWzgJrEny6wFcICkRIXpm5nB7FZBFQlTpz8AXYFr4CdxIkXIRBXKEhc uTKPBcTmFLCXmHfwKpgtJJAmseTWbvYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrr 5WaW6KWmlG5iBIeMJN8Oxq8HlQ4xCnAwKvHw6q397CvEmlhWXJl7iFGSg0lJlFfnBFCILyk/ pTIjsTgjvqg0J7X4EKMEB7OSCO/69k++QrwpiZVVqUX5MClpDhYlcd6Zkuq+QgLpiSWp2amp BalFMFkZDg4lCd7NJ4GGChalpqdWpGXmlCCkmTg4QYbzAA0/ClLDW1yQmFucmQ6RP8Woy/F4 w6ZDjEIsefl5qVLivPdBigRAijJK8+DmwGL9FaM40FvCvD9AqniAaQJu0iugJUxASwRKwZaU JCKkpBoYhWdHbI9PW/3Q+ahSvbrjLCNFhcN9gYlLD/1cFzq98vRrs9D3B/eIr+QPUvv2t1sx rHj74kP7p21Zeu3ekSPvol7FF9enbdgn9Va6u03xU+amLn/D7X2FCzqubsm0vH6+bheTrcw/ 6X+bvS9L9E65eIJxyjGn5/6rp1w9rKO+9nNY5zrhr5PndSmxFGckGmoxFxUnAgBCLpum0AIA AA== Cc: Austin Clements X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2011 20:05:31 -0000 Previously, this function would synchronize the folder list even if removing the file name failed. Now it returns immediately if removing the file name fails. --- lib/message.cc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/message.cc b/lib/message.cc index 4b59fa9..afb1d80 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -529,6 +529,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message, "file-direntry", direntry); status = COERCE_STATUS (private_status, "Unexpected error from _notmuch_message_remove_term"); + if (status) + return status; /* Re-synchronize "folder:" terms for this message. This requires * first removing all "folder:" terms, then adding back terms for -- 1.7.5.1