[PATCH v2 3/6] go: Update Go bindings for new notmuch_database_{open, create} signatures

diff --git a/48/264485eb8683c3f8f159b0451ebf8a9c47e5e2 b/48/264485eb8683c3f8f159b0451ebf8a9c47e5e2
new file mode 100644 (file)
index 0000000..4d4cb0b
--- /dev/null
+++ b/48/264485eb8683c3f8f159b0451ebf8a9c47e5e2
@@ -0,0 +1,144 @@
+Return-Path: <amthrax@drake.mit.edu>\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 EF299431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 09:25:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 fbUDJvI5xjuT for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Apr 2012 09:25:46 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 05B5B429E25\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 09:25:44 -0700 (PDT)\r
+X-AuditID: 12074424-b7fae6d000000906-ec-4f9ebd08d2bf\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C1.7E.02310.80DBE9F4; Mon, 30 Apr 2012 12:25:44 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q3UGPiiC001282; \r
+       Mon, 30 Apr 2012 12:25:44 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3UGPgXp005257\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 30 Apr 2012 12:25:43 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SOtPx-0006HA-O3; Mon, 30 Apr 2012 12:25:41 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/6] go: Update Go bindings for new notmuch_database_{open,\r
+       create} signatures\r
+Date: Mon, 30 Apr 2012 12:25:35 -0400\r
+Message-Id: <1335803138-24024-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1335803138-24024-1-git-send-email-amdragon@mit.edu>\r
+References: <1335651473-19652-1-git-send-email-amdragon@mit.edu>\r
+       <1335803138-24024-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrsuxd56/wczLuhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxuL+VUwF1/grmm59Y2lgPMPTxcjJISFgIrHn7wpmCFtM4sK9\r
+       9WxdjFwcQgL7GCVe/N0L5WxglPj5voMZwrnPJDHz9h1GCGc+o8Tpt+uYQPrZBDQktu1fzghi\r
+       iwhIS+y8O5u1i5GDg1lATeJPlwpIWFggQeLZhfdsIDaLgKrE6j9zWUBsXgEHiQ0n7rNDnKEg\r
+       8WzdcbCRnAKOErcOfAOrERIol9h44RPjBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3TN\r
+       9XIzS/RSU0o3MYLDxkVlB2PzIaVDjAIcjEo8vC8XzvMXYk0sK67MPcQoycGkJMqruwcoxJeU\r
+       n1KZkVicEV9UmpNafIhRgoNZSYS3dCJQjjclsbIqtSgfJiXNwaIkzquh9c5PSCA9sSQ1OzW1\r
+       ILUIJivDwaEkwWsPMlSwKDU9tSItM6cEIc3EwQkynAdoOFgNb3FBYm5xZjpE/hSjopQ4LwNI\r
+       QgAkkVGaB9cLi+tXjOJArwjzSoBU8QBTAlz3K6DBTECD883BBpckIqSkGhi1Zr5f2L0g+oJT\r
+       pJdgQ+jupoI/mvuD5kq6z743zXt/cO+s0E2WBopxk/awhT4+bfAh6ycrb+eU1jCWtNToxNfT\r
+       DvKJPKk2Tn56h3XRycxjVRLzrx1TMljAxOsf/UZrS6jfJI0NtYZHz0b9KAvwbmb8etR+RYbB\r
+       26n8smZdXTOdXZi1JihdtVRiKc5INNRiLipOBACNwu0RxgIAAA==\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 16:25:47 -0000\r
+\r
+This requires changing the return types of NewDatabase and\r
+OpenDatabase to follow the standard Go convention for returning\r
+errors.\r
+---\r
+ bindings/go/pkg/notmuch.go |   24 ++++++++++++------------\r
+ 1 files changed, 12 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/bindings/go/pkg/notmuch.go b/bindings/go/pkg/notmuch.go\r
+index d32901d..86e9645 100644\r
+--- a/bindings/go/pkg/notmuch.go\r
++++ b/bindings/go/pkg/notmuch.go\r
+@@ -86,21 +86,21 @@ const (\r
+ )\r
+ \r
+ // Create a new, empty notmuch database located at 'path'\r
+-func NewDatabase(path string) *Database {\r
++func NewDatabase(path string) (*Database, Status) {\r
+ \r
+       var c_path *C.char = C.CString(path)\r
+       defer C.free(unsafe.Pointer(c_path))\r
+ \r
+       if c_path == nil {\r
+-              return nil\r
++              return nil, STATUS_OUT_OF_MEMORY\r
+       }\r
+ \r
+       self := &Database{db:nil}\r
+-      self.db = C.notmuch_database_create(c_path)\r
+-      if self.db == nil {\r
+-              return nil\r
++      st := Status(C.notmuch_database_create(c_path, &self.db))\r
++      if st != STATUS_SUCCESS {\r
++              return nil, st\r
+       }\r
+-      return self\r
++      return self, st\r
+ }\r
+ \r
+ /* Open an existing notmuch database located at 'path'.\r
+@@ -120,21 +120,21 @@ func NewDatabase(path string) *Database {\r
+  * In case of any failure, this function returns NULL, (after printing\r
+  * an error message on stderr).\r
+  */\r
+-func OpenDatabase(path string, mode DatabaseMode) *Database {\r
++func OpenDatabase(path string, mode DatabaseMode) (*Database, Status) {\r
+ \r
+       var c_path *C.char = C.CString(path)\r
+       defer C.free(unsafe.Pointer(c_path))\r
+ \r
+       if c_path == nil {\r
+-              return nil\r
++              return nil, STATUS_OUT_OF_MEMORY\r
+       }\r
+ \r
+       self := &Database{db:nil}\r
+-      self.db = C.notmuch_database_open(c_path, C.notmuch_database_mode_t(mode))\r
+-      if self.db == nil {\r
+-              return nil\r
++      st := Status(C.notmuch_database_open(c_path, C.notmuch_database_mode_t(mode), &self.db))\r
++      if st != STATUS_SUCCESS {\r
++              return nil, st\r
+       }\r
+-      return self\r
++      return self, st\r
+ }\r
+ \r
+ /* Close the given notmuch database, freeing all associated\r
+-- \r
+1.7.9.1\r
+\r