c0/eb6c40b7a165dab460fa90016a8b99fe3c61ad

   1 Return-Path: <amthrax@drake.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 D5AE8431FC9\r
   6         for <notmuch@notmuchmail.org>; Sat, 28 Apr 2012 15:18:02 -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 2RYtR0TQFDF2 for <notmuch@notmuchmail.org>;\r
  16         Sat, 28 Apr 2012 15:18:01 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 67EFF431FB6\r
  20         for <notmuch@notmuchmail.org>; Sat, 28 Apr 2012 15:18:01 -0700 (PDT)\r
  21 X-AuditID: 1209190f-b7f4f6d00000092b-2c-4f9c6c97cba7\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 30.91.02347.79C6C9F4; Sat, 28 Apr 2012 18:17:59 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q3SMHwYC028568; \r
  27         Sat, 28 Apr 2012 18:17:58 -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 q3SMHvqb008920\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 28 Apr 2012 18:17:58 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1SOFxl-00058J-6z; Sat, 28 Apr 2012 18:17:57 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 3/6] go: Update Go bindings for new notmuch_database_{open,\r
  41         create} signatures\r
  42 Date: Sat, 28 Apr 2012 18:17:50 -0400\r
  43 Message-Id: <1335651473-19652-4-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.9.1\r
  45 In-Reply-To: <1335651473-19652-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1335651473-19652-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nojs9Z46/waEnEhbXb85kdmD0eLbq\r
  49         FnMAYxSXTUpqTmZZapG+XQJXxuL+VUwF1/grmm59Y2lgPMPTxcjJISFgIrHu7WR2CFtM4sK9\r
  50         9WxdjFwcQgL7GCXmd9xkh3A2MEo8uv8cKnOfSeLbtimMEM58RokjW/+zgvSzCWhIbNu/nBHE\r
  51         FhGQlth5dzZQnIODWUBN4k+XCkhYWCBWou/4PDYQm0VAVeJb5ywWEJtXwEHi69qpbBBnKEg8\r
  52         W3ecCcTmFHCU+L/5BNh5QkA1HfMmsE1g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI10Qv\r
  53         N7NELzWldBMjKGw4Jfl3MH47qHSIUYCDUYmH98j6Wf5CrIllxZW5hxglOZiURHlZsub4C/El\r
  54         5adUZiQWZ8QXleakFh9ilOBgVhLh1RYHyvGmJFZWpRblw6SkOViUxHnVtN75CQmkJ5akZqem\r
  55         FqQWwWRlODiUJHiPZgM1ChalpqdWpGXmlCCkmTg4QYbzAA3/DlLDW1yQmFucmQ6RP8WoKCUO\r
  56         kRAASWSU5sH1wuL6FaM40CvCvFzAKBfiAaYEuO5XQIOZgAYzec4CGVySiJCSamC0+rTS53CH\r
  57         xY/aL32+Ta1by+t2qEZ4zz5zx5B1zxO2ilmKe2PnanL//hb5cXuI8IGXN5yty1cJbr4U3ixg\r
  58         P2vGtIr/ki99C/Wl1Zabat5yu9H4dM3hWY+nfcrVaokS9wmpLjphcD/Mf93lqHMPRVpOfpk/\r
  59         Ty5DzHyrZYbihtMFwY7S7Abf9ixVYinOSDTUYi4qTgQAhFOZDsYCAAA=\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Sat, 28 Apr 2012 22:18:03 -0000\r
  73 \r
  74 This requires changing the return types of NewDatabase and\r
  75 OpenDatabase to follow the standard Go convention for returning\r
  76 errors.\r
  77 ---\r
  78  bindings/go/pkg/notmuch.go |   24 ++++++++++++------------\r
  79  1 files changed, 12 insertions(+), 12 deletions(-)\r
  80 \r
  81 diff --git a/bindings/go/pkg/notmuch.go b/bindings/go/pkg/notmuch.go\r
  82 index d32901d..86e9645 100644\r
  83 --- a/bindings/go/pkg/notmuch.go\r
  84 +++ b/bindings/go/pkg/notmuch.go\r
  85 @@ -86,21 +86,21 @@ const (\r
  86  )\r
  87  \r
  88  // Create a new, empty notmuch database located at 'path'\r
  89 -func NewDatabase(path string) *Database {\r
  90 +func NewDatabase(path string) (*Database, Status) {\r
  91  \r
  92         var c_path *C.char = C.CString(path)\r
  93         defer C.free(unsafe.Pointer(c_path))\r
  94  \r
  95         if c_path == nil {\r
  96 -               return nil\r
  97 +               return nil, STATUS_OUT_OF_MEMORY\r
  98         }\r
  99  \r
 100         self := &Database{db:nil}\r
 101 -       self.db = C.notmuch_database_create(c_path)\r
 102 -       if self.db == nil {\r
 103 -               return nil\r
 104 +       st := Status(C.notmuch_database_create(c_path, &self.db))\r
 105 +       if st != STATUS_SUCCESS {\r
 106 +               return nil, st\r
 107         }\r
 108 -       return self\r
 109 +       return self, st\r
 110  }\r
 111  \r
 112  /* Open an existing notmuch database located at 'path'.\r
 113 @@ -120,21 +120,21 @@ func NewDatabase(path string) *Database {\r
 114   * In case of any failure, this function returns NULL, (after printing\r
 115   * an error message on stderr).\r
 116   */\r
 117 -func OpenDatabase(path string, mode DatabaseMode) *Database {\r
 118 +func OpenDatabase(path string, mode DatabaseMode) (*Database, Status) {\r
 119  \r
 120         var c_path *C.char = C.CString(path)\r
 121         defer C.free(unsafe.Pointer(c_path))\r
 122  \r
 123         if c_path == nil {\r
 124 -               return nil\r
 125 +               return nil, STATUS_OUT_OF_MEMORY\r
 126         }\r
 127  \r
 128         self := &Database{db:nil}\r
 129 -       self.db = C.notmuch_database_open(c_path, C.notmuch_database_mode_t(mode))\r
 130 -       if self.db == nil {\r
 131 -               return nil\r
 132 +       st := Status(C.notmuch_database_open(c_path, C.notmuch_database_mode_t(mode), &self.db))\r
 133 +       if st != STATUS_SUCCESS {\r
 134 +               return nil, st\r
 135         }\r
 136 -       return self\r
 137 +       return self, st\r
 138  }\r
 139  \r
 140  /* Close the given notmuch database, freeing all associated\r
 141 -- \r
 142 1.7.9.1\r
 143 \r