From e3e6619b57d233594753a8e1c90ed69b13883d65 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 25 Jul 2012 22:34:53 +2000 Subject: [PATCH] [PATCH 13/13] show: Remove now unused fields from notmuch_show_format --- 56/59a945b599c224dfd5e805090a0a7cddde87d9 | 116 ++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 56/59a945b599c224dfd5e805090a0a7cddde87d9 diff --git a/56/59a945b599c224dfd5e805090a0a7cddde87d9 b/56/59a945b599c224dfd5e805090a0a7cddde87d9 new file mode 100644 index 000000000..ac76ce8b2 --- /dev/null +++ b/56/59a945b599c224dfd5e805090a0a7cddde87d9 @@ -0,0 +1,116 @@ +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 C40FB431FBD + for ; Tue, 24 Jul 2012 19:35:10 -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 Vn4CbDw+QWio for ; + Tue, 24 Jul 2012 19:35:08 -0700 (PDT) +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 4E86B431FD2 + for ; Tue, 24 Jul 2012 19:35:06 -0700 (PDT) +X-AuditID: 1209190c-b7f806d000006b87-de-500f5b5947ec +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP + id 02.C8.27527.95B5F005; Tue, 24 Jul 2012 22:35:05 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6P2Z5VI011181; + Tue, 24 Jul 2012 22:35:05 -0400 +Received: from drake.dyndns.org + (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 q6P2Z3Ot025132 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 24 Jul 2012 22:35:04 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1StrRG-0004aK-Sy; Tue, 24 Jul 2012 22:35:02 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 13/13] show: Remove now unused fields from notmuch_show_format +Date: Tue, 24 Jul 2012 22:34:53 -0400 +Message-Id: <1343183693-17134-14-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu> +References: <1343183693-17134-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrBsZzR9g8KBdz2JvQzujxfWbM5kd + mDwWb9rP5vFs1S3mAKYoLpuU1JzMstQifbsEroxzf2YwFszgrpjYv5KpgfEzRxcjJ4eEgInE + 9mtP2SBsMYkL99YD2VwcQgL7GCVON19khHA2MEo8u36ZGcJ5xCTx99VHqMxcRok5yxcxgvSz + CWhIbNu/HMwWEZCW2Hl3NiuIzSxgJjH350SwHcICfhLH7x0Ei7MIqEpMfHcRLM4r4Cgxua2R + EeIOeYmn9/vA4pxA8fNLFoLFhQQcJHoWX2OfwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5q + ka6hXm5miV5qSukmRnAwSfLsYHxzUOkQowAHoxIP7+8nfAFCrIllxZW5hxglOZiURHkrgvkD + hPiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwFoUB5XhTEiurUovyYVLSHCxK4ryXU276CwmkJ5ak + ZqemFqQWwWRlODiUJHj3RwE1ChalpqdWpGXmlCCkmTg4QYbzAA3fDVLDW1yQmFucmQ6RP8Wo + KCXOqw2SEABJZJTmwfXCov0VozjQK8IQ7TzARAHX/QpoMBPQ4OdhfCCDSxIRUlINjKuVFooX + e9rdyJaeG2nIlbQn60LQDYuva48UGwde/vhE+FjKlckSGv65WSnR/6ZJ8U5z8F+ltu3/lfrb + Pv0Hf50q2VwtJqh0eZJpruVG1/uXv9/weFCzhPv39ZQFGtJnNxsun8TWXjfV66gQY4PQA/Xm + QqF9ncYXDEKYfmmHZL/LXDRP6vsFbyWW4oxEQy3mouJEAJECK3vRAgAA +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: Wed, 25 Jul 2012 02:35:11 -0000 + +The message_set_{begin,sep,end} and null_message fields are no longer +used because we now use the structure printer provided by the format. +--- + notmuch-client.h | 4 ---- + notmuch-show.c | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index 21c3231..de31aa1 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -71,13 +71,9 @@ struct notmuch_show_params; + + typedef struct notmuch_show_format { + sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream); +- const char *message_set_start; + notmuch_status_t (*part) (const void *ctx, sprinter_t *sprinter, + struct mime_node *node, int indent, + const struct notmuch_show_params *params); +- const char *message_set_sep; +- const char *message_set_end; +- const char *null_message; + } notmuch_show_format_t; + + typedef struct notmuch_crypto { +diff --git a/notmuch-show.c b/notmuch-show.c +index a0da48a..f5bc098 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -37,11 +37,7 @@ format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node, + + static const notmuch_show_format_t format_json = { + .new_sprinter = sprinter_json_create, +- .message_set_start = "[", + .part = format_part_json_entry, +- .message_set_sep = ", ", +- .message_set_end = "]", +- .null_message = "null" + }; + + static notmuch_status_t +-- +1.7.10 + -- 2.26.2