[PATCH v2 2/5] go: Update for changes to notmuch_database_get_directory

diff --git a/93/eb7aa3c60f60cf042f8a45982ea54d2b4d8a14 b/93/eb7aa3c60f60cf042f8a45982ea54d2b4d8a14
new file mode 100644 (file)
index 0000000..be1f45c
--- /dev/null
+++ b/93/eb7aa3c60f60cf042f8a45982ea54d2b4d8a14
@@ -0,0 +1,114 @@
+Return-Path: <amdragon@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 C5440431FC0\r
+       for <notmuch@notmuchmail.org>; Sun, 13 May 2012 16:36:24 -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 p3da1f3-rUrz for <notmuch@notmuchmail.org>;\r
+       Sun, 13 May 2012 16:36:24 -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 72765431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 13 May 2012 16:36:23 -0700 (PDT)\r
+X-AuditID: 12074424-b7fae6d000000906-87-4fb04576a1af\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id AC.DA.02310.67540BF4; Sun, 13 May 2012 19:36:22 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4DNaLGQ025783; \r
+       Sun, 13 May 2012 19:36:21 -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 q4DNaKf7001097\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 13 May 2012 19:36:20 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1STiKq-0004YM-0o; Sun, 13 May 2012 19:36:20 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/5] go: Update for changes to\r
+       notmuch_database_get_directory\r
+Date: Sun, 13 May 2012 19:36:10 -0400\r
+Message-Id: <1336952173-17422-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1336952173-17422-1-git-send-email-amdragon@mit.edu>\r
+References: <1336939029-13969-1-git-send-email-amdragon@mit.edu>\r
+       <1336952173-17422-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsUixCmqrFvmusHfYPZRbovZrT+YLG60djNa\r
+       NE13trh+cyazxZuV81gdWD0Of13I4jHx/Gk2j1v3X7N7PFt1i9ljy6H3zAGsUVw2Kak5mWWp\r
+       Rfp2CVwZj5+8YymYxFmx/O80pgbGvexdjJwcEgImEk0vJkHZYhIX7q1nA7GFBPYxSrxaHtjF\r
+       yAVkb2CU2LnoDAuEc59JYnbHMWYIZxajxJl5r1lAWtgENCS27V/OCGKLCEhL7Lw7mxWkiFmg\r
+       i1Hi95tmZpCEsECAxL11R4EaODhYBFQlnh9QBwnzCjhIrFq2iQniDHmJp/f7wM7gFHCU6Hvw\r
+       kR3ipHKJGe3XWSYw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiXl1qka66Xm1mil5pSuokRFITs\r
+       Lio7GJsPKR1iFOBgVOLhnWS8wV+INbGsuDL3EKMkB5OSKC+TE1CILyk/pTIjsTgjvqg0J7X4\r
+       EKMEB7OSCO/6h+v9hXhTEiurUovyYVLSHCxK4rwaWu/8hATSE0tSs1NTC1KLYLIyHBxKErwP\r
+       XICGChalpqdWpGXmlCCkmTg4QYbzAA3nBEatEG9xQWJucWY6RP4Uo6KUOO8VkGYBkERGaR5c\r
+       LyxJvGIUB3pFmPcHSBUPMMHAdb8CGswENJhfYB3I4JJEhJRUA6PUmyjzH5FK7UZp0j/mVc3r\r
+       8vlnPFH5Vf9FwXpra01jx5WLyy/wXi5S6+1gOcGccOHvunc7T6svy3YonGY4ect7nfcXnV4s\r
+       UWc/HKu9fOnWgz0mR7PUzLs8rBa6t81Kfb+mYYrGyZj6FwLTo2L96oxu3pnd+eeSiRDzWS/P\r
+       1P9+Aoeipe//b1JiKc5INNRiLipOBABufnpp7QIAAA==\r
+Cc: tomi.ollila@iki.fi\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: Sun, 13 May 2012 23:36:25 -0000\r
+\r
+---\r
+ bindings/go/src/notmuch/notmuch.go |   13 +++++++------\r
+ 1 file changed, 7 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/bindings/go/src/notmuch/notmuch.go b/bindings/go/src/notmuch/notmuch.go\r
+index 12de4c8..00bd53a 100644\r
+--- a/bindings/go/src/notmuch/notmuch.go\r
++++ b/bindings/go/src/notmuch/notmuch.go\r
+@@ -191,19 +191,20 @@ func (self *Database) NeedsUpgrade() bool {\r
+  *\r
+  * Can return NULL if a Xapian exception occurs.\r
+  */\r
+-func (self *Database) GetDirectory(path string) *Directory {\r
++func (self *Database) GetDirectory(path string) (*Directory, Status) {\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
+-      c_dir := C.notmuch_database_get_directory(self.db, c_path)\r
+-      if c_dir == nil {\r
+-              return nil\r
++      var c_dir *C.notmuch_directory_t\r
++      st := Status(C.notmuch_database_get_directory(self.db, c_path, &c_dir))\r
++      if st != STATUS_SUCCESS || c_dir == nil {\r
++              return nil, st\r
+       }\r
+-      return &Directory{dir: c_dir}\r
++      return &Directory{dir: c_dir}, st\r
+ }\r
+ \r
+ /* Add a new message to the given notmuch database.\r
+-- \r
+1.7.10\r
+\r