From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id E0976429E41 for ; Sun, 28 Dec 2014 09:38:06 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 p10hhQr9xYFu for ; Sun, 28 Dec 2014 09:38:02 -0800 (PST) Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 241AD429E3E for ; Sun, 28 Dec 2014 09:38:01 -0800 (PST) Received: from remotemail by yantan.tethera.net with local (Exim 4.80) (envelope-from ) id 1Y5Hmv-0002fj-Mx; Sun, 28 Dec 2014 13:37:57 -0400 Received: (nullmailer pid 11504 invoked by uid 1000); Sun, 28 Dec 2014 17:37:40 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [Patch v3 6/6] lib: eliminate fprintf from _notmuch_message_file_open Date: Sun, 28 Dec 2014 18:33:50 +0100 Message-Id: <1419788030-10567-7-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1419788030-10567-1-git-send-email-david@tethera.net> References: <1419788030-10567-1-git-send-email-david@tethera.net> 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: Sun, 28 Dec 2014 17:38:07 -0000 You may wonder why _notmuch_message_file_open_ctx has two parameters. This is because we need sometime to use a ctx which is a notmuch_message_t. While we could get the database from this, there is no easy way in C to tell type we are getting. The remaining fprintf is removed by Jani's series un-deprecating single message mboxes. --- lib/database.cc | 2 +- lib/message-file.c | 11 +++++++---- lib/message.cc | 3 ++- lib/notmuch-private.h | 5 +++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 19f5f0e..b144885 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -2298,7 +2298,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch, if (ret) return ret; - message_file = _notmuch_message_file_open (filename); + message_file = _notmuch_message_file_open (notmuch, filename); if (message_file == NULL) return NOTMUCH_STATUS_FILE_ERROR; diff --git a/lib/message-file.c b/lib/message-file.c index eda1b74..1f55cdf 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -76,7 +76,8 @@ _notmuch_message_file_destructor (notmuch_message_file_t *message) /* Create a new notmuch_message_file_t for 'filename' with 'ctx' as * the talloc owner. */ notmuch_message_file_t * -_notmuch_message_file_open_ctx (void *ctx, const char *filename) +_notmuch_message_file_open_ctx (notmuch_database_t *notmuch, + void *ctx, const char *filename) { notmuch_message_file_t *message; @@ -98,16 +99,18 @@ _notmuch_message_file_open_ctx (void *ctx, const char *filename) return message; FAIL: - fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno)); + _notmuch_database_log (notmuch, "Error opening %s: %s\n", + filename, strerror (errno)); _notmuch_message_file_close (message); return NULL; } notmuch_message_file_t * -_notmuch_message_file_open (const char *filename) +_notmuch_message_file_open (notmuch_database_t *notmuch, + const char *filename) { - return _notmuch_message_file_open_ctx (NULL, filename); + return _notmuch_message_file_open_ctx (notmuch, NULL, filename); } void diff --git a/lib/message.cc b/lib/message.cc index 541eabc..4251b44 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -437,7 +437,8 @@ _notmuch_message_ensure_message_file (notmuch_message_t *message) if (unlikely (filename == NULL)) return; - message->message_file = _notmuch_message_file_open_ctx (message, filename); + message->message_file = _notmuch_message_file_open_ctx ( + _notmuch_message_database (message), message, filename); } const char * diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index fad3a92..76a2f33 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -359,11 +359,12 @@ typedef struct _notmuch_message_file notmuch_message_file_t; * Returns NULL if any error occurs. */ notmuch_message_file_t * -_notmuch_message_file_open (const char *filename); +_notmuch_message_file_open (notmuch_database_t *notmuch, const char *filename); /* Like notmuch_message_file_open but with 'ctx' as the talloc owner. */ notmuch_message_file_t * -_notmuch_message_file_open_ctx (void *ctx, const char *filename); +_notmuch_message_file_open_ctx (notmuch_database_t *notmuch, + void *ctx, const char *filename); /* Close a notmuch message previously opened with notmuch_message_open. */ void -- 2.1.3