c8/65c83a7c855c18250f876462eb3724fb95d9b1

   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 A71AA431FC3\r
   6         for <notmuch@notmuchmail.org>; Sat, 28 Apr 2012 15:18:00 -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 v0tC0wCY0DtJ for <notmuch@notmuchmail.org>;\r
  16         Sat, 28 Apr 2012 15:18:00 -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 A9BB2431FB6\r
  20         for <notmuch@notmuchmail.org>; Sat, 28 Apr 2012 15:17:59 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7fae6d000000906-de-4f9c6c977d77\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 35.EE.02310.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-3.mit.edu (8.13.8/8.9.2) with ESMTP id q3SMHw9v005267; \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 q3SMHvCa008923\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-00058P-Jl; 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 5/6] ruby: Update Ruby bindings for new\r
  41  notmuch_database_{open,        create} signatures\r
  42 Date: Sat, 28 Apr 2012 18:17:52 -0400\r
  43 Message-Id: <1335651473-19652-6-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+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrTs9Z46/wco1ChbXb85kdmD0eLbq\r
  49         FnMAYxSXTUpqTmZZapG+XQJXxo0H21gKGjkrThzazdLA2MfexcjJISFgItH25TozhC0mceHe\r
  50         erYuRi4OIYF9jBInd+xngXA2MErs2LebFcK5zyTRuWo5I4Qzn1Hiz9xLYP1sAhoS2/aDJDg5\r
  51         RASkJXbenQ3UwcHBLKAm8adLBcQUFkiUaDseA1LBIqAqsbFtAtgVvAIOEhMuHWeDuEJB4tm6\r
  52         40wgNqeAo8T/zSfAaoSAajrmTWCbwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5qka65Xm5m\r
  53         iV5qSukmRlDQsLuo7GBsPqR0iFGAg1GJh3dX1hx/IdbEsuLK3EOMkhxMSqK8LCAhvqT8lMqM\r
  54         xOKM+KLSnNTiQ4wSHMxKIrza4kA53pTEyqrUonyYlDQHi5I4r4bWOz8hgfTEktTs1NSC1CKY\r
  55         rAwHh5IEb2s2UKNgUWp6akVaZk4JQpqJgxNkOA/Q8D0gNbzFBYm5xZnpEPlTjIpS4rzrQRIC\r
  56         IImM0jy4XlhUv2IUB3pFmHc6SBUPMCHAdb8CGswENJjJcxbI4JJEhJRUA6N4Y+Kzmy+MqnaF\r
  57         +l13+x0RVPcmt5i9uV7gd+lEzuQysSuKH0+p6Pp0fDESlK21mFk5VdPr2u6rL8/V5mtOkph+\r
  58         /fm7xOnFJv+/llo0tPrd33SQ6fODL/mfldLMdHqY22eylJpXq/IUXls9LZZviY6s9YaupJNH\r
  59         Ll0PzbydVVX44Vh7cU1QuBJLcUaioRZzUXEiAF8tiHfFAgAA\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:00 -0000\r
  73 \r
  74 ---\r
  75  bindings/ruby/database.c |   12 +++++++++---\r
  76  1 files changed, 9 insertions(+), 3 deletions(-)\r
  77 \r
  78 diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c\r
  79 index ba9a139..409d54f 100644\r
  80 --- a/bindings/ruby/database.c\r
  81 +++ b/bindings/ruby/database.c\r
  82 @@ -42,6 +42,8 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)\r
  83      int create, mode;\r
  84      VALUE pathv, hashv;\r
  85      VALUE modev;\r
  86 +    notmuch_database_t *database;\r
  87 +    notmuch_status_t ret;\r
  88  \r
  89      /* Check arguments */\r
  90      rb_scan_args (argc, argv, "11", &pathv, &hashv);\r
  91 @@ -73,9 +75,13 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)\r
  92      }\r
  93  \r
  94      Check_Type (self, T_DATA);\r
  95 -    DATA_PTR (self) = create ? notmuch_database_create (path) : notmuch_database_open (path, mode);\r
  96 -    if (!DATA_PTR (self))\r
  97 -       rb_raise (notmuch_rb_eDatabaseError, "Failed to open database");\r
  98 +    if (create)\r
  99 +       ret = notmuch_database_create (path, &database);\r
 100 +    else\r
 101 +       ret = notmuch_database_open (path, mode, &database);\r
 102 +    notmuch_rb_status_raise (ret);\r
 103 +\r
 104 +    DATA_PTR (self) = database;\r
 105  \r
 106      return self;\r
 107  }\r
 108 -- \r
 109 1.7.9.1\r
 110 \r