From 70099d119116af999d32816f6e8f2a54ba4c3b6b Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Tue, 1 May 2012 12:25:37 +2000 Subject: [PATCH] [PATCH v2 5/6] ruby: Update Ruby bindings for new notmuch_database_{open, create} signatures --- 7b/38af8a07bf3e757e6964a53f94775046975aa7 | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 7b/38af8a07bf3e757e6964a53f94775046975aa7 diff --git a/7b/38af8a07bf3e757e6964a53f94775046975aa7 b/7b/38af8a07bf3e757e6964a53f94775046975aa7 new file mode 100644 index 000000000..eaa5b8ee4 --- /dev/null +++ b/7b/38af8a07bf3e757e6964a53f94775046975aa7 @@ -0,0 +1,111 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 68CF942116A + for ; Mon, 30 Apr 2012 09:26:17 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Zq-YjRGlR9BT for ; + Mon, 30 Apr 2012 09:26:15 -0700 (PDT) +Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU + [18.9.25.14]) + by olra.theworths.org (Postfix) with ESMTP id D2B8D429E54 + for ; Mon, 30 Apr 2012 09:25:49 -0700 (PDT) +X-AuditID: 1209190e-b7fd86d0000008b4-32-4f9ebd0d2659 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id AE.BC.02228.D0DBE9F4; Mon, 30 Apr 2012 12:25:49 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q3UGPnwr022299; + Mon, 30 Apr 2012 12:25:49 -0400 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3UGPhSh005260 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Mon, 30 Apr 2012 12:25:48 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SOtPy-0006HG-4V; Mon, 30 Apr 2012 12:25:42 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 5/6] ruby: Update Ruby bindings for new + notmuch_database_{open, create} signatures +Date: Mon, 30 Apr 2012 12:25:37 -0400 +Message-Id: <1335803138-24024-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1335803138-24024-1-git-send-email-amdragon@mit.edu> +References: <1335651473-19652-1-git-send-email-amdragon@mit.edu> + <1335803138-24024-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrMu7d56/weOdQhbXb85kdmD0eLbq + FnMAYxSXTUpqTmZZapG+XQJXxo0H21gKGjkrThzazdLA2MfexcjJISFgInFz0WEmCFtM4sK9 + 9WxdjFwcQgL7GCVuzb3ADuFsYJRouv6BGcK5zyRxfd8EqLL5jBINbZvYQPrZBDQktu1fzghi + iwhIS+y8O5u1i5GDg1lATeJPlwpIWFggReLc5ydgq1kEVCVmTfwHZvMKOEi8OtMNdZKCxLN1 + x8FO4hRwlLh14BsLiC0kUC6x8cInxgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGuvl + ZpbopaaUbmIEh40k3w7GrweVDjEKcDAq8fC+WjjPX4g1say4MvcQoyQHk5Ior+4eoBBfUn5K + ZUZicUZ8UWlOavEhRgkOZiUR3tKJQDnelMTKqtSifJiUNAeLkjivmtY7PyGB9MSS1OzU1ILU + IpisDAeHkgTvRpChgkWp6akVaZk5JQhpJg5OkOE8QMPtQWp4iwsSc4sz0yHypxgVpcR5p4Ak + BEASGaV5cL2wuH7FKA70ijCvBEgVDzAlwHW/AhrMBDQ43xxscEkiQkqqgbGh9qHRsqrNXU5u + LHWea8pLew9NEHDRzOC94ljyfN2jHM5w5dCTOiU1B4PL9lVyb33gMWvH+e+7O5T52ljm1ri2 + v93wv+PqOqaAnPm6JxjvGMXu8l1wXUvZPcd3KsdNUVfVeUoJNX4NCxgvXG157CQRNOufycIy + 6xkvljV4/94jbtaw2TNFTImlOCPRUIu5qDgRAEmPrdTGAgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 30 Apr 2012 16:26:18 -0000 + +--- + bindings/ruby/database.c | 12 +++++++++--- + 1 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c +index ba9a139..409d54f 100644 +--- a/bindings/ruby/database.c ++++ b/bindings/ruby/database.c +@@ -42,6 +42,8 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self) + int create, mode; + VALUE pathv, hashv; + VALUE modev; ++ notmuch_database_t *database; ++ notmuch_status_t ret; + + /* Check arguments */ + rb_scan_args (argc, argv, "11", &pathv, &hashv); +@@ -73,9 +75,13 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self) + } + + Check_Type (self, T_DATA); +- DATA_PTR (self) = create ? notmuch_database_create (path) : notmuch_database_open (path, mode); +- if (!DATA_PTR (self)) +- rb_raise (notmuch_rb_eDatabaseError, "Failed to open database"); ++ if (create) ++ ret = notmuch_database_create (path, &database); ++ else ++ ret = notmuch_database_open (path, mode, &database); ++ notmuch_rb_status_raise (ret); ++ ++ DATA_PTR (self) = database; + + return self; + } +-- +1.7.9.1 + -- 2.26.2