34/7db57008b726fc1af512d225ac6ed7f2ac152b

   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 E140E431FAF\r
   6         for <notmuch@notmuchmail.org>; Sat, 28 Apr 2012 14:45:23 -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 s4yDpDqO8SYd for <notmuch@notmuchmail.org>;\r
  16         Sat, 28 Apr 2012 14:45:23 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 4EB9B431FAE\r
  20         for <notmuch@notmuchmail.org>; Sat, 28 Apr 2012 14:45:23 -0700 (PDT)\r
  21 X-AuditID: 12074422-b7fd66d0000008f9-b6-4f9c64f23af2\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 8A.7D.02297.2F46C9F4; Sat, 28 Apr 2012 17:45:22 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q3SLjLAB005494; \r
  27         Sat, 28 Apr 2012 17:45: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 q3SLjK9o005936\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 28 Apr 2012 17:45:21 -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 1SOFSB-0000X1-UQ; Sat, 28 Apr 2012 17:45:20 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH] go: Update to the current notmuch_database_find_message API\r
  41 Date: Sat, 28 Apr 2012 17:45:18 -0400\r
  42 Message-Id: <1335649518-1970-1-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.9.1\r
  44 X-Brightmail-Tracker:\r
  45  H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsUixG6nrvspZY6/wZUVshbXb85kdmD0eLbq\r
  46         FnMAYxSXTUpqTmZZapG+XQJXxv0TtxgL2rgrzvy6ztzA+J+ji5GDQ0LARGLzTO8uRk4gU0zi\r
  47         wr31bF2MXBxCAvsYJZ6cucsM4WxglHjwezIjhHOfSeL610ksEM58Romlv9vZQfrZBDQktu1f\r
  48         zghiiwhIS+y8O5sVZAWzgJrEny4VkLCwgI/EmoOzmUFsFgFVibkzfrOB2LwC9hKdW9eyQ5yh\r
  49         IPFs3XGmCYy8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFuma6uVmluilppRuYgQHgYvSDsaf\r
  50         B5UOMQpwMCrx8B5aP8tfiDWxrLgy9xCjJAeTkihvQfIcfyG+pPyUyozE4oz4otKc1OJDjBIc\r
  51         zEoivNriQDnelMTKqtSifJiUNAeLkjivutY7PyGB9MSS1OzU1ILUIpisDAeHkgQvEzDYhQSL\r
  52         UtNTK9Iyc0oQ0kwcnCDDeYCG/wNZzFtckJhbnJkOkT/FqCglzisJ0iwAksgozYPrhUXpK0Zx\r
  53         oFeEeblAqniAEQ7X/QpoMBPQYCbPWSCDSxIRUlINjH6Hb/Au3eIgqzr5pJNc+ML5G1XbFxl0\r
  54         TpkYkLm/rHBVU3ykHqvDd1nfbrlZN14kzLw18VmUYcIuNdfr2xdF+8wrWst8u1L0Qtzu97sF\r
  55         vmTVcR6UE3p5L7NmW+jqV3whBdIT1PPNXVP2ZAQezkjceNp00fX+qUmnPNd9nM3V1bMpUGxm\r
  56         3o6fDUosxRmJhlrMRcWJAAo+rJ2tAgAA\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Sat, 28 Apr 2012 21:45:24 -0000\r
  70 \r
  71 The signature of notmuch_database_find_message was changed in 02a30767\r
  72 to report errors and the Go bindings were never updated.  This brings\r
  73 the Go bindings in sync with that change and at least makes them\r
  74 compile with Go r60.3, the last release before Go 1.\r
  75 ---\r
  76  bindings/go/pkg/notmuch.go |   13 +++++++------\r
  77  1 files changed, 7 insertions(+), 6 deletions(-)\r
  78 \r
  79 diff --git a/bindings/go/pkg/notmuch.go b/bindings/go/pkg/notmuch.go\r
  80 index c6844ef..8fe400b 100644\r
  81 --- a/bindings/go/pkg/notmuch.go\r
  82 +++ b/bindings/go/pkg/notmuch.go\r
  83 @@ -306,20 +306,21 @@ func (self *Database) RemoveMessage(fname string) Status {\r
  84   *     * An out-of-memory situation occurs\r
  85   *     * A Xapian exception occurs\r
  86   */\r
  87 -func (self *Database) FindMessage(message_id string) *Message {\r
  88 +func (self *Database) FindMessage(message_id string) (*Message, Status) {\r
  89         \r
  90         var c_msg_id *C.char = C.CString(message_id)\r
  91         defer C.free(unsafe.Pointer(c_msg_id))\r
  92  \r
  93         if c_msg_id == nil {\r
  94 -               return nil\r
  95 +               return nil, STATUS_OUT_OF_MEMORY\r
  96         }\r
  97  \r
  98 -       msg := C.notmuch_database_find_message(self.db, c_msg_id)\r
  99 -       if msg == nil {\r
 100 -               return nil\r
 101 +       msg := &Message{message:nil}\r
 102 +       st := Status(C.notmuch_database_find_message(self.db, c_msg_id, &msg.message))\r
 103 +       if st != STATUS_SUCCESS {\r
 104 +               return nil, st\r
 105         }\r
 106 -       return &Message{message:msg}\r
 107 +       return msg, st\r
 108  }\r
 109  \r
 110  /* Return a list of all tags found in the database.\r
 111 -- \r
 112 1.7.9.1\r
 113 \r