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 EF299431FAE for ; Mon, 30 Apr 2012 09:25:46 -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 fbUDJvI5xjuT for ; Mon, 30 Apr 2012 09:25:46 -0700 (PDT) Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU [18.7.68.36]) by olra.theworths.org (Postfix) with ESMTP id 05B5B429E25 for ; Mon, 30 Apr 2012 09:25:44 -0700 (PDT) X-AuditID: 12074424-b7fae6d000000906-ec-4f9ebd08d2bf Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id C1.7E.02310.80DBE9F4; Mon, 30 Apr 2012 12:25:44 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q3UGPiiC001282; Mon, 30 Apr 2012 12:25:44 -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 q3UGPgXp005257 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Mon, 30 Apr 2012 12:25:43 -0400 (EDT) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1SOtPx-0006HA-O3; Mon, 30 Apr 2012 12:25:41 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v2 3/6] go: Update Go bindings for new notmuch_database_{open, create} signatures Date: Mon, 30 Apr 2012 12:25:35 -0400 Message-Id: <1335803138-24024-4-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+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrsuxd56/wczLuhbXb85kdmD0eLbq FnMAYxSXTUpqTmZZapG+XQJXxuL+VUwF1/grmm59Y2lgPMPTxcjJISFgIrHn7wpmCFtM4sK9 9WxdjFwcQgL7GCVe/N0L5WxglPj5voMZwrnPJDHz9h1GCGc+o8Tpt+uYQPrZBDQktu1fzghi iwhIS+y8O5u1i5GDg1lATeJPlwpIWFggQeLZhfdsIDaLgKrE6j9zWUBsXgEHiQ0n7rNDnKEg 8WzdcbCRnAKOErcOfAOrERIol9h44RPjBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3TN 9XIzS/RSU0o3MYLDxkVlB2PzIaVDjAIcjEo8vC8XzvMXYk0sK67MPcQoycGkJMqruwcoxJeU n1KZkVicEV9UmpNafIhRgoNZSYS3dCJQjjclsbIqtSgfJiXNwaIkzquh9c5PSCA9sSQ1OzW1 ILUIJivDwaEkwWsPMlSwKDU9tSItM6cEIc3EwQkynAdoOFgNb3FBYm5xZjpE/hSjopQ4LwNI QgAkkVGaB9cLi+tXjOJArwjzSoBU8QBTAlz3K6DBTECD883BBpckIqSkGhi1Zr5f2L0g+oJT pJdgQ+jupoI/mvuD5kq6z743zXt/cO+s0E2WBopxk/awhT4+bfAh6ycrb+eU1jCWtNToxNfT DvKJPKk2Tn56h3XRycxjVRLzrx1TMljAxOsf/UZrS6jfJI0NtYZHz0b9KAvwbmb8etR+RYbB 26n8smZdXTOdXZi1JihdtVRiKc5INNRiLipOBACNwu0RxgIAAA== 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:25:47 -0000 This requires changing the return types of NewDatabase and OpenDatabase to follow the standard Go convention for returning errors. --- bindings/go/pkg/notmuch.go | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bindings/go/pkg/notmuch.go b/bindings/go/pkg/notmuch.go index d32901d..86e9645 100644 --- a/bindings/go/pkg/notmuch.go +++ b/bindings/go/pkg/notmuch.go @@ -86,21 +86,21 @@ const ( ) // Create a new, empty notmuch database located at 'path' -func NewDatabase(path string) *Database { +func NewDatabase(path string) (*Database, Status) { var c_path *C.char = C.CString(path) defer C.free(unsafe.Pointer(c_path)) if c_path == nil { - return nil + return nil, STATUS_OUT_OF_MEMORY } self := &Database{db:nil} - self.db = C.notmuch_database_create(c_path) - if self.db == nil { - return nil + st := Status(C.notmuch_database_create(c_path, &self.db)) + if st != STATUS_SUCCESS { + return nil, st } - return self + return self, st } /* Open an existing notmuch database located at 'path'. @@ -120,21 +120,21 @@ func NewDatabase(path string) *Database { * In case of any failure, this function returns NULL, (after printing * an error message on stderr). */ -func OpenDatabase(path string, mode DatabaseMode) *Database { +func OpenDatabase(path string, mode DatabaseMode) (*Database, Status) { var c_path *C.char = C.CString(path) defer C.free(unsafe.Pointer(c_path)) if c_path == nil { - return nil + return nil, STATUS_OUT_OF_MEMORY } self := &Database{db:nil} - self.db = C.notmuch_database_open(c_path, C.notmuch_database_mode_t(mode)) - if self.db == nil { - return nil + st := Status(C.notmuch_database_open(c_path, C.notmuch_database_mode_t(mode), &self.db)) + if st != STATUS_SUCCESS { + return nil, st } - return self + return self, st } /* Close the given notmuch database, freeing all associated -- 1.7.9.1