Merge branch 'release'

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 8da3295e3cee204c7ac847928fbe477c1608b659..0200b9c4a4cd28fe7126d83b5b0045c82037e9bb 100644 (file)
--- 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);
@@ -866,7 +865,7 @@ do_show_single (void *ctx,
 
        while (!feof (file)) {
            size = fread (buf, 1, sizeof (buf), file);
-           fwrite (buf, size, 1, stdout);
+           (void) fwrite (buf, size, 1, stdout);
        }
 
        fclose (file);