93/eb7aa3c60f60cf042f8a45982ea54d2b4d8a14

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id C5440431FC0\r
   6         for <notmuch@notmuchmail.org>; Sun, 13 May 2012 16:36:24 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id p3da1f3-rUrz for <notmuch@notmuchmail.org>;\r
  16         Sun, 13 May 2012 16:36:24 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 72765431FBC\r
  20         for <notmuch@notmuchmail.org>; Sun, 13 May 2012 16:36:23 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7fae6d000000906-87-4fb04576a1af\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id AC.DA.02310.67540BF4; Sun, 13 May 2012 19:36:22 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4DNaLGQ025783; \r
  27         Sun, 13 May 2012 19:36:21 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4DNaKf7001097\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 13 May 2012 19:36:20 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1STiKq-0004YM-0o; Sun, 13 May 2012 19:36:20 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 2/5] go: Update for changes to\r
  41         notmuch_database_get_directory\r
  42 Date: Sun, 13 May 2012 19:36:10 -0400\r
  43 Message-Id: <1336952173-17422-3-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10\r
  45 In-Reply-To: <1336952173-17422-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1336939029-13969-1-git-send-email-amdragon@mit.edu>\r
  47         <1336952173-17422-1-git-send-email-amdragon@mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsUixCmqrFvmusHfYPZRbovZrT+YLG60djNa\r
  50         NE13trh+cyazxZuV81gdWD0Of13I4jHx/Gk2j1v3X7N7PFt1i9ljy6H3zAGsUVw2Kak5mWWp\r
  51         Rfp2CVwZj5+8YymYxFmx/O80pgbGvexdjJwcEgImEk0vJkHZYhIX7q1nA7GFBPYxSrxaHtjF\r
  52         yAVkb2CU2LnoDAuEc59JYnbHMWYIZxajxJl5r1lAWtgENCS27V/OCGKLCEhL7Lw7mxWkiFmg\r
  53         i1Hi95tmZpCEsECAxL11R4EaODhYBFQlnh9QBwnzCjhIrFq2iQniDHmJp/f7wM7gFHCU6Hvw\r
  54         kR3ipHKJGe3XWSYw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiXl1qka66Xm1mil5pSuokRFITs\r
  55         Lio7GJsPKR1iFOBgVOLhnWS8wV+INbGsuDL3EKMkB5OSKC+TE1CILyk/pTIjsTgjvqg0J7X4\r
  56         EKMEB7OSCO/6h+v9hXhTEiurUovyYVLSHCxK4rwaWu/8hATSE0tSs1NTC1KLYLIyHBxKErwP\r
  57         XICGChalpqdWpGXmlCCkmTg4QYbzAA3nBEatEG9xQWJucWY6RP4Uo6KUOO8VkGYBkERGaR5c\r
  58         LyxJvGIUB3pFmPcHSBUPMMHAdb8CGswENJhfYB3I4JJEhJRUA6PUmyjzH5FK7UZp0j/mVc3r\r
  59         8vlnPFH5Vf9FwXpra01jx5WLyy/wXi5S6+1gOcGccOHvunc7T6svy3YonGY4ect7nfcXnV4s\r
  60         UWc/HKu9fOnWgz0mR7PUzLs8rBa6t81Kfb+mYYrGyZj6FwLTo2L96oxu3pnd+eeSiRDzWS/P\r
  61         1P9+Aoeipe//b1JiKc5INNRiLipOBABufnpp7QIAAA==\r
  62 Cc: tomi.ollila@iki.fi\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Sun, 13 May 2012 23:36:25 -0000\r
  76 \r
  77 ---\r
  78  bindings/go/src/notmuch/notmuch.go |   13 +++++++------\r
  79  1 file changed, 7 insertions(+), 6 deletions(-)\r
  80 \r
  81 diff --git a/bindings/go/src/notmuch/notmuch.go b/bindings/go/src/notmuch/notmuch.go\r
  82 index 12de4c8..00bd53a 100644\r
  83 --- a/bindings/go/src/notmuch/notmuch.go\r
  84 +++ b/bindings/go/src/notmuch/notmuch.go\r
  85 @@ -191,19 +191,20 @@ func (self *Database) NeedsUpgrade() bool {\r
  86   *\r
  87   * Can return NULL if a Xapian exception occurs.\r
  88   */\r
  89 -func (self *Database) GetDirectory(path string) *Directory {\r
  90 +func (self *Database) GetDirectory(path string) (*Directory, Status) {\r
  91         var c_path *C.char = C.CString(path)\r
  92         defer C.free(unsafe.Pointer(c_path))\r
  93  \r
  94         if c_path == nil {\r
  95 -               return nil\r
  96 +               return nil, STATUS_OUT_OF_MEMORY\r
  97         }\r
  98  \r
  99 -       c_dir := C.notmuch_database_get_directory(self.db, c_path)\r
 100 -       if c_dir == nil {\r
 101 -               return nil\r
 102 +       var c_dir *C.notmuch_directory_t\r
 103 +       st := Status(C.notmuch_database_get_directory(self.db, c_path, &c_dir))\r
 104 +       if st != STATUS_SUCCESS || c_dir == nil {\r
 105 +               return nil, st\r
 106         }\r
 107 -       return &Directory{dir: c_dir}\r
 108 +       return &Directory{dir: c_dir}, st\r
 109  }\r
 110  \r
 111  /* Add a new message to the given notmuch database.\r
 112 -- \r
 113 1.7.10\r
 114 \r