diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2011-12-24 13:52:43 -0500 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2011-12-25 22:17:27 -0400 |
| commit | 36f7fe5a1c83f3f0dd8fc883db558ab058b974f3 (patch) | |
| tree | d571d2883fb41250a26c855209b2ffe1f640fce4 | |
| parent | c44a0edadca995ddee4b159e9c465d40a32af6e4 (diff) | |
show: Pass notmuch_message_t instead of path to show_message_body.
In addition to simplifying the code, we'll need the notmuch_message_t*
in show_message_body shortly.
| -rw-r--r-- | notmuch-client.h | 2 | ||||
| -rw-r--r-- | notmuch-reply.c | 3 | ||||
| -rw-r--r-- | notmuch-show.c | 3 | ||||
| -rw-r--r-- | show-message.c | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index c602e2e0..c521efa0 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -162,7 +162,7 @@ char * query_string_from_args (void *ctx, int argc, char *argv[]); notmuch_status_t -show_message_body (const char *filename, +show_message_body (notmuch_message_t *message, const notmuch_show_format_t *format, notmuch_show_params_t *params); diff --git a/notmuch-reply.c b/notmuch-reply.c index 7ac879f9..f8d5f647 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -546,8 +546,7 @@ notmuch_reply_format_default(void *ctx, notmuch_message_get_header (message, "date"), notmuch_message_get_header (message, "from")); - show_message_body (notmuch_message_get_filename (message), - format, params); + show_message_body (message, format, params); notmuch_message_destroy (message); } diff --git a/notmuch-show.c b/notmuch-show.c index 19fb49f2..0200b9c4 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -758,8 +758,7 @@ show_message (void *ctx, } if (format->part_content) - show_message_body (notmuch_message_get_filename (message), - format, params); + show_message_body (message, format, params); if (params->part <= 0) { fputs (format->body_end, stdout); diff --git a/show-message.c b/show-message.c index d83f04ec..09fa607f 100644 --- a/show-message.c +++ b/show-message.c @@ -175,7 +175,7 @@ show_message_part (GMimeObject *part, } notmuch_status_t -show_message_body (const char *filename, +show_message_body (notmuch_message_t *message, const notmuch_show_format_t *format, notmuch_show_params_t *params) { @@ -183,6 +183,7 @@ show_message_body (const char *filename, GMimeParser *parser = NULL; GMimeMessage *mime_message = NULL; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; + const char *filename = notmuch_message_get_filename (message); FILE *file = NULL; show_message_state_t state; |