From: David Bremner Date: Fri, 26 Dec 2014 17:34:49 +0000 (+0100) Subject: lib: eliminate fprintf from _notmuch_message_file_open X-Git-Tag: 0.20~22 X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=9d192da683b0656e37fc8d69c69698ca605926b3;hp=736ac26407914425a9c94e86616225292cf716dd;p=notmuch lib: eliminate fprintf from _notmuch_message_file_open 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. --- diff --git a/lib/database.cc b/lib/database.cc index 416d99c2..cffab62c 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -2314,7 +2314,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 a41d9ad2..8ac96e8e 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 a8ca9884..5bc7aff1 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 dc58a2fd..cc9ce12c 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -358,11 +358,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