56/59a945b599c224dfd5e805090a0a7cddde87d9

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id C40FB431FBD\r
   6         for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:10 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id Vn4CbDw+QWio for <notmuch@notmuchmail.org>;\r
  16         Tue, 24 Jul 2012 19:35:08 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 4E86B431FD2\r
  20         for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:06 -0700 (PDT)\r
  21 X-AuditID: 1209190c-b7f806d000006b87-de-500f5b5947ec\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 02.C8.27527.95B5F005; Tue, 24 Jul 2012 22:35:05 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6P2Z5VI011181; \r
  27         Tue, 24 Jul 2012 22:35:05 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6P2Z3Ot025132\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 24 Jul 2012 22:35:04 -0400 (EDT)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1StrRG-0004aK-Sy; Tue, 24 Jul 2012 22:35:02 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 13/13] show: Remove now unused fields from notmuch_show_format\r
  41 Date: Tue, 24 Jul 2012 22:34:53 -0400\r
  42 Message-Id: <1343183693-17134-14-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10\r
  44 In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrBsZzR9g8KBdz2JvQzujxfWbM5kd\r
  48         mDwWb9rP5vFs1S3mAKYoLpuU1JzMstQifbsEroxzf2YwFszgrpjYv5KpgfEzRxcjJ4eEgInE\r
  49         9mtP2SBsMYkL99YD2VwcQgL7GCVON19khHA2MEo8u36ZGcJ5xCTx99VHqMxcRok5yxcxgvSz\r
  50         CWhIbNu/HMwWEZCW2Hl3NiuIzSxgJjH350SwHcICfhLH7x0Ei7MIqEpMfHcRLM4r4Cgxua2R\r
  51         EeIOeYmn9/vA4pxA8fNLFoLFhQQcJHoWX2OfwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5q\r
  52         ka6hXm5miV5qSukmRnAwSfLsYHxzUOkQowAHoxIP7+8nfAFCrIllxZW5hxglOZiURHkrgvkD\r
  53         hPiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwFoUB5XhTEiurUovyYVLSHCxK4ryXU276CwmkJ5ak\r
  54         ZqemFqQWwWRlODiUJHj3RwE1ChalpqdWpGXmlCCkmTg4QYbzAA3fDVLDW1yQmFucmQ6RP8Wo\r
  55         KCXOqw2SEABJZJTmwfXCov0VozjQK8IQ7TzARAHX/QpoMBPQ4OdhfCCDSxIRUlINjKuVFooX\r
  56         e9rdyJaeG2nIlbQn60LQDYuva48UGwde/vhE+FjKlckSGv65WSnR/6ZJ8U5z8F+ltu3/lfrb\r
  57         Pv0Hf50q2VwtJqh0eZJpruVG1/uXv9/weFCzhPv39ZQFGtJnNxsun8TWXjfV66gQY4PQA/Xm\r
  58         QqF9ncYXDEKYfmmHZL/LXDRP6vsFbyWW4oxEQy3mouJEAJECK3vRAgAA\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Wed, 25 Jul 2012 02:35:11 -0000\r
  72 \r
  73 The message_set_{begin,sep,end} and null_message fields are no longer\r
  74 used because we now use the structure printer provided by the format.\r
  75 ---\r
  76  notmuch-client.h |    4 ----\r
  77  notmuch-show.c   |    4 ----\r
  78  2 files changed, 8 deletions(-)\r
  79 \r
  80 diff --git a/notmuch-client.h b/notmuch-client.h\r
  81 index 21c3231..de31aa1 100644\r
  82 --- a/notmuch-client.h\r
  83 +++ b/notmuch-client.h\r
  84 @@ -71,13 +71,9 @@ struct notmuch_show_params;\r
  85  \r
  86  typedef struct notmuch_show_format {\r
  87      sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream);\r
  88 -    const char *message_set_start;\r
  89      notmuch_status_t (*part) (const void *ctx, sprinter_t *sprinter,\r
  90                               struct mime_node *node, int indent,\r
  91                               const struct notmuch_show_params *params);\r
  92 -    const char *message_set_sep;\r
  93 -    const char *message_set_end;\r
  94 -    const char *null_message;\r
  95  } notmuch_show_format_t;\r
  96  \r
  97  typedef struct notmuch_crypto {\r
  98 diff --git a/notmuch-show.c b/notmuch-show.c\r
  99 index a0da48a..f5bc098 100644\r
 100 --- a/notmuch-show.c\r
 101 +++ b/notmuch-show.c\r
 102 @@ -37,11 +37,7 @@ format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
 103  \r
 104  static const notmuch_show_format_t format_json = {\r
 105      .new_sprinter = sprinter_json_create,\r
 106 -    .message_set_start = "[",\r
 107      .part = format_part_json_entry,\r
 108 -    .message_set_sep = ", ",\r
 109 -    .message_set_end = "]",\r
 110 -    .null_message = "null"\r
 111  };\r
 112  \r
 113  static notmuch_status_t\r
 114 -- \r
 115 1.7.10\r
 116 \r