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 1171C429E25 for ; Fri, 9 Dec 2011 11:54:43 -0800 (PST) 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 Ns1X6yCinjl0 for ; Fri, 9 Dec 2011 11:54:42 -0800 (PST) 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 6C070429E2F for ; Fri, 9 Dec 2011 11:54:40 -0800 (PST) X-AuditID: 1209190c-b7f806d0000008d6-e6-4ee2677f5e32 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id BB.F6.02262.F7762EE4; Fri, 9 Dec 2011 14:54:39 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id pB9Jsd8F029548; Fri, 9 Dec 2011 14:54:39 -0500 Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id pB9Jsb7Q013134 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Fri, 9 Dec 2011 14:54:38 -0500 (EST) Received: from amthrax by drake.mit.edu with local (Exim 4.76) (envelope-from ) id 1RZ6Wj-00015O-7I; Fri, 09 Dec 2011 14:54:37 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 1/4] show: Pass notmuch_message_t instead of path to show_message_body. Date: Fri, 9 Dec 2011 14:54:25 -0500 Message-Id: <1323460468-4030-2-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323460468-4030-1-git-send-email-amdragon@mit.edu> References: <1323027100-10307-1-git-send-email-amdragon@mit.edu> <1323460468-4030-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6noluf/sjPYN9Ca4vrN2cyOzB6PFt1 izmAMYrLJiU1J7MstUjfLoEro79tAntBm1DF5JfrmRsYr/J1MXJySAiYSOz+epQFwhaTuHBv PRuILSSwj1Hi+J/ILkYuIHs9o8S8ny0sEM4xJomF+3dBOfMZJXontoK1sAloSGzbv5wRxBYR kJbYeXc2axcjBwezgJrEny4VEFNYIFzi3hsfkAoWAVWJrTM7WEFsXgF7iW2XLrFDHKEgcW71 OTCbU8BB4turL+wQB5VJ3Oz8zj6BkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXUO93MwS vdSU0k2MoJDhlOTZwfjmoNIhRgEORiUeXk+vR35CrIllxZW5hxglOZiURHlfpwGF+JLyUyoz Eosz4otKc1KLDzFKcDArifCqyAPleFMSK6tSi/JhUtIcLErivNW7HvoJCaQnlqRmp6YWpBbB ZGU4OJQkeH+ADBUsSk1PrUjLzClBSDNxcIIM5wEaHhoJMry4IDG3ODMdIn+KUVFKnPcsSLMA SCKjNA+uFxbTrxjFgV4R5lUCaecBpgO47ldAg5mABn/JfgAyuCQRISXVwOiptdt+xTHzZc4x W9M4WSQ6WXy9y1nvF2lwRn0VEJa6Hv7g3rO5l8XKzyoqrm3u2LjI9G/EQ+43/a9qP3Bd50xz 7d/Xml7/88Zv66eTJ9R9mpTwQuVXpPEihRwZAxOFfVucEmcmePBd4+G7LnGKadYr0/nC2dHz 3vf4m67PWyxzhy344iU9LiWW4oxEQy3mouJEAHA2s2HEAgAA 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, 09 Dec 2011 19:54:43 -0000 In addition to simplifying the code, we'll need the notmuch_message_t* in show_message_body shortly. --- notmuch-client.h | 2 +- notmuch-reply.c | 3 +-- notmuch-show.c | 3 +-- show-message.c | 3 ++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 703f856..be21781 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 7ac879f..f8d5f64 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 603992a..1dee3aa 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -753,8 +753,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 d83f04e..09fa607 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; -- 1.7.7.3