Re: [PATCH 1/6] lib/cli: Make notmuch_database_open return a status code

diff --git a/f6/df97e1ab697f2f69ea8e313affa13c0f71e70f b/f6/df97e1ab697f2f69ea8e313affa13c0f71e70f
new file mode 100644 (file)
index 0000000..a0e49dc
--- /dev/null
+++ b/f6/df97e1ab697f2f69ea8e313affa13c0f71e70f
@@ -0,0 +1,79 @@
+Return-Path: <bremner@unb.ca>\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 8AD15431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 04:39:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 pu18RhfCQpkk for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Apr 2012 04:39:41 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D351B431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 04:39:41 -0700 (PDT)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)\r
+       (Exim 4.72) (envelope-from <bremner@unb.ca>)\r
+       id 1SOox8-0004bH-1b; Mon, 30 Apr 2012 08:39:38 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1SOox2-0004VF-Jy; Mon, 30 Apr 2012 08:39:32 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/6] lib/cli: Make notmuch_database_open return a status\r
+       code\r
+In-Reply-To: <1335651473-19652-2-git-send-email-amdragon@mit.edu>\r
+References: <1335651473-19652-1-git-send-email-amdragon@mit.edu>\r
+       <1335651473-19652-2-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.12+152~g904a807 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 30 Apr 2012 08:39:32 -0300\r
+Message-ID: <87pqapphxn.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Spam_bar: -\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: Mon, 30 Apr 2012 11:39:42 -0000\r
+\r
+\r
+I have two questions, both of which might have been settled previously.\r
+\r
+>  \r
+> -    return notmuch;\r
+> +    *database = notmuch;\r
+> +    return status;\r
+>  }\r
+\r
+Should we check database is non-NULL here?\r
+\r
+> diff --git a/notmuch-count.c b/notmuch-count.c\r
+> index 9c2ad7b..2f98128 100644\r
+> --- a/notmuch-count.c\r
+> +++ b/notmuch-count.c\r
+\r
+> +    if (notmuch_database_open (notmuch_config_get_database_path (config),\r
+> +                           NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))\r
+\r
+Is it OK to rely on NOTMUCH_STATUS_SUCCESS==0 ?\r
+\r
+d\r