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 113ED431FB6 for ; Sat, 7 Apr 2012 17:58:03 -0700 (PDT) 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 XII1fBCS07g4 for ; Sat, 7 Apr 2012 17:58:02 -0700 (PDT) Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU [18.7.68.37]) by olra.theworths.org (Postfix) with ESMTP id 64039431FD6 for ; Sat, 7 Apr 2012 17:58:00 -0700 (PDT) X-AuditID: 12074425-b7f4a6d0000008e0-68-4f80e2972140 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP id 81.05.02272.792E08F4; Sat, 7 Apr 2012 20:57:59 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q380vxnP005095; Sat, 7 Apr 2012 20:57:59 -0400 Received: from drake.mit.edu (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q380vwHV002165 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sat, 7 Apr 2012 20:57:58 -0400 (EDT) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1SGgS6-0001SP-1F; Sat, 07 Apr 2012 20:57:58 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 2/6] show: Remove support for old-style formatters in show_message Date: Sat, 7 Apr 2012 20:57:46 -0400 Message-Id: <1333846670-5356-3-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu> References: <1333846670-5356-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrTv9UYO/wdvl1hbXb85kdmD0eLbq FnMAYxSXTUpqTmZZapG+XQJXxvYfW1kKrvBXfN5ygr2BcR5PFyMnh4SAiUTL/tXMELaYxIV7 69m6GLk4hAT2MUrsuXOaFcJZzyix+PwxdgjnHpPE2RvbmCCc+YwSS+5eAutnE9CQ2LZ/OSOI LSIgLbHz7mygdg4OZgE1iT9dKiBhYYEgiW/rn7GA2CwCqhJL3yxlBynhFbCXuP/JBeIKBYln 644zgdicAg4S21u3gk0XAipZuvg44wRG/gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0LfRy M0v0UlNKNzGCgobdRXUH44RDSocYBTgYlXh4LXY3+AuxJpYVV+YeYpTkYFIS5X36ACjEl5Sf UpmRWJwRX1Sak1p8iFGCg1lJhPf+YaAcb0piZVVqUT5MSpqDRUmcV1PrnZ+QQHpiSWp2ampB ahFMVoaDQ0mC9/VDoEbBotT01Iq0zJwShDQTByfIcB6g4ZKPQIYXFyTmFmemQ+RPMSpKifO+ AGkWAElklObB9cKi+hWjONArwrzfQap4gAkBrvsV0GAmoME1r+pBBpckIqSkGhh1E+1bxI+G 96feXOxe8Np80oEU3u0RtrzcRiW79bptfvJO/GT+SD5SK/Hsliy935yLVddvPzjt5rMUk1ID K+8ebSv23z/e8iydx88ldXLG8r93XBl2npP/vSqjOVjf6c812dBXe/9rdjXKr3hyL8oq/5ir 8GK3HXIzdJdd+OFwW1mqdYVXUoESS3FGoqEWc1FxIgAzq8zTxQIAAA== 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, 08 Apr 2012 00:58:03 -0000 show_message used to have a compatibility path for old-style formatters. This removes that. --- notmuch-show.c | 52 +++++++++++++--------------------------------------- 1 files changed, 13 insertions(+), 39 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 0bf5e21..5a71115 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -815,46 +815,20 @@ show_message (void *ctx, int indent, notmuch_show_params_t *params) { - if (format->part) { - void *local = talloc_new (ctx); - mime_node_t *root, *part; - notmuch_status_t status; - - status = mime_node_open (local, message, params->cryptoctx, - params->decrypt, &root); - if (status) - goto DONE; - part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); - if (part) - status = format->part (local, part, indent, params); - DONE: - talloc_free (local); - return status; - } - - if (params->part <= 0) { - fputs (format->message_start, stdout); - if (format->message) - format->message(ctx, message, indent); - - fputs (format->header_start, stdout); - if (format->header) - format->header(ctx, message); - fputs (format->header_end, stdout); - - fputs (format->body_start, stdout); - } - - if (format->part_content) - show_message_body (message, format, params); - - if (params->part <= 0) { - fputs (format->body_end, stdout); - - fputs (format->message_end, stdout); - } + void *local = talloc_new (ctx); + mime_node_t *root, *part; + notmuch_status_t status; - return NOTMUCH_STATUS_SUCCESS; + status = mime_node_open (local, message, params->cryptoctx, + params->decrypt, &root); + if (status) + goto DONE; + part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); + if (part) + status = format->part (local, part, indent, params); + DONE: + talloc_free (local); + return status; } static notmuch_status_t -- 1.7.9.1