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 329A6431FB6 for ; Fri, 1 Jun 2012 07:17:14 -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 5zR7sZ5KUrMz for ; Fri, 1 Jun 2012 07:17:12 -0700 (PDT) Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU [18.9.25.12]) by olra.theworths.org (Postfix) with ESMTP id 06135431FAF for ; Fri, 1 Jun 2012 07:17:11 -0700 (PDT) X-AuditID: 1209190c-b7fb16d000000926-4f-4fc8cee72196 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id 47.D6.02342.7EEC8CF4; Fri, 1 Jun 2012 10:17:11 -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 q51EHAQn005535; Fri, 1 Jun 2012 10:17:10 -0400 Received: from drake.dyndns.org (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 q51EH906006361 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Fri, 1 Jun 2012 10:17:10 -0400 (EDT) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1SaSep-0005qC-HU; Fri, 01 Jun 2012 10:16:51 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH] notmuch-deliver: Update to new notmuch_database_open API Date: Fri, 1 Jun 2012 10:16:49 -0400 Message-Id: <1338560209-22406-1-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixG6nrvv83Al/g9PTFS0WPIm1uH5zJrMD k8fOWXfZPZ6tusUcwBTFZZOSmpNZllqkb5fAlbH99krWgs2cFTcXbmBvYLzN3sXIySEhYCLR eewcE4QtJnHh3no2EFtIYB+jxK/Fhl2MXED2ekaJrW1/mSGch0wSD5YegHLmMkqc+roErIVN QENi2/7ljCC2iIC0xM67s1lBbGYBR4mzv3rB1gkLeErsP3kPbB2LgKrEnGN9YPW8Ag4Sf09d ZoU4Q17i6f0+tgmMvAsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGurlZpbopaaUbmIEBQan JM8OxjcHlQ4xCnAwKvHwds057i/EmlhWXJl7iFGSg0lJlHf+2RP+QnxJ+SmVGYnFGfFFpTmp xYcYJTiYlUR4+c8A5XhTEiurUovyYVLSHCxK4rwrNXf7CwmkJ5akZqemFqQWwWRlODiUJHhF gREgJFiUmp5akZaZU4KQZuLgBBnOAzT8Hchi3uKCxNzizHSI/ClGRSlx3g0gCQGQREZpHlwv LHJfMYoDvSLMywKyggcY9XDdr4AGMwEN/n/2KMjgkkSElFQDY3vzZblzt/vebN6qmmn9P784 Iu3l6emNDSv+zjrwc80slQMbruVaTP4Z/kHM9s6GlymTQ9/fry7ZXmE+2XV6T4vIY68shRUV jvumKLfWnEzxdgrz+1fx/XHBqeJHP1sy3dVOcXclx/a0FkVdDHmxaYr6Mb/Sj64vYzPnCK5V zyjo+byiioW9QImlOCPRUIu5qDgRAC1Uooe3AgAA 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: Fri, 01 Jun 2012 14:17:14 -0000 Commit 5fddc07 changed this API, but missed this use of it. --- contrib/notmuch-deliver/src/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c index 37d2919..032b9d6 100644 --- a/contrib/notmuch-deliver/src/main.c +++ b/contrib/notmuch-deliver/src/main.c @@ -359,6 +359,7 @@ main(int argc, char **argv) GOptionContext *ctx; GError *error = NULL; notmuch_database_t *db; + notmuch_status_t status; ctx = g_option_context_new("[FOLDER]"); g_option_context_add_main_entries(ctx, options, PACKAGE); @@ -429,7 +430,14 @@ main(int argc, char **argv) maildir = g_strdup(db_path); g_debug("Opening notmuch database `%s'", db_path); - db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE); + status = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE, + &db); + if (status) { + g_critical("Failed to open database `%s': %s", + db_path, notmuch_status_to_string(status)); + g_free(maildir); + return EX_SOFTWARE; + } g_free(db_path); if (db == NULL) return EX_SOFTWARE; -- 1.7.10