From f35b8b24ea62a3bf622d7e85c63c6e1aa61d1da3 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 22 Apr 2012 14:07:55 +0200 Subject: [PATCH] [PATCH 5/7] go: Use notmuch_database_destroy instead of notmuch_database_close --- ff/623725ef973c8cba85c85dd2e6c519fe9c90fc | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 ff/623725ef973c8cba85c85dd2e6c519fe9c90fc diff --git a/ff/623725ef973c8cba85c85dd2e6c519fe9c90fc b/ff/623725ef973c8cba85c85dd2e6c519fe9c90fc new file mode 100644 index 000000000..223badba8 --- /dev/null +++ b/ff/623725ef973c8cba85c85dd2e6c519fe9c90fc @@ -0,0 +1,94 @@ +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 09E4E431FD0 + for ; Sun, 22 Apr 2012 05:08:51 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 f+OjZTbtPLO0 for ; + Sun, 22 Apr 2012 05:08:50 -0700 (PDT) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 4010A431FDE + for ; Sun, 22 Apr 2012 05:08:50 -0700 (PDT) +Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id 96A4E5836F8 + for ; Sun, 22 Apr 2012 14:08:48 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id E2F37DF2A1; Sun, 22 Apr 2012 14:08:47 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id DE440DF2A4; + Sun, 22 Apr 2012 14:08:28 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1SLvad-0007B3-4j; Sun, 22 Apr 2012 14:08:27 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 5/7] go: Use notmuch_database_destroy instead of + notmuch_database_close +Date: Sun, 22 Apr 2012 14:07:55 +0200 +Message-Id: + <1335096477-27537-5-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: + <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <20120422120620.26225.40778@thinkbox.jade-hamburg.de> + <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de> +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: Sun, 22 Apr 2012 12:08:51 -0000 + +Adapt the go bindings to the notmuch_database_close split. + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + bindings/go/pkg/notmuch.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bindings/go/pkg/notmuch.go b/bindings/go/pkg/notmuch.go +index c6844ef..d32901d 100644 +--- a/bindings/go/pkg/notmuch.go ++++ b/bindings/go/pkg/notmuch.go +@@ -114,7 +114,7 @@ func NewDatabase(path string) *Database { + * An existing notmuch database can be identified by the presence of a + * directory named ".notmuch" below 'path'. + * +- * The caller should call notmuch_database_close when finished with ++ * The caller should call notmuch_database_destroy when finished with + * this database. + * + * In case of any failure, this function returns NULL, (after printing +@@ -140,7 +140,7 @@ func OpenDatabase(path string, mode DatabaseMode) *Database { + /* Close the given notmuch database, freeing all associated + * resources. See notmuch_database_open. */ + func (self *Database) Close() { +- C.notmuch_database_close(self.db) ++ C.notmuch_database_destroy(self.db) + } + + /* Return the database path of the given database. +-- +1.7.10 + -- 2.26.2