b4/5d48478de8182ba92763bba21217f4caffff88

   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 E4146431FB6\r
   6         for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:43 -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 sVHH2EHx5E33 for <notmuch@notmuchmail.org>;\r
  16         Fri, 27 Jul 2012 21:29:42 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 71BA1431FD0\r
  20         for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:28 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7f2a6d0000008bf-b3-50136aa88a31\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C4.1B.02239.8AA63105; Sat, 28 Jul 2012 00:29:28 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q6S4TSCe002964; \r
  27         Sat, 28 Jul 2012 00:29:28 -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 q6S4TLfb027364\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 28 Jul 2012 00:29:22 -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 1SuyeX-0002XJ-01; Sat, 28 Jul 2012 00:29:20 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 13/13] show: Remove now unused fields from\r
  41         notmuch_show_format\r
  42 Date: Sat, 28 Jul 2012 00:29:14 -0400\r
  43 Message-Id: <1343449754-9010-14-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10\r
  45 In-Reply-To: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsUixG6norsiSzjA4HmTgMXehnZGi9VzeSyu\r
  49         35zJbPFm5TxWBxaPnbPusnss3rSfzePw14UsHs9W3WIOYInisklJzcksSy3St0vgypj5/gxT\r
  50         wQzuiu4/n9kbGD9zdDFyckgImEhMe7uAGcIWk7hwbz1bFyMXh5DAPkaJ1ncnmSGcDYwSC940\r
  51         skA4j5gktu74AFU2l1FiReNqdpB+NgENiW37lzOC2CIC0hI7785m7WLk4GAWyJN4vFYCJCws\r
  52         ECixY8ZxNhCbRUBVomtDGxOIzSvgIPGkazcrxBnyEk/v94HVcALFN7/8AHaekIC9xO7JG1gn\r
  53         MPIvYGRYxSibklulm5uYmVOcmqxbnJyYl5dapGuul5tZopeaUrqJERxwLio7GJsPKR1iFOBg\r
  54         VOLhPXVFKECINbGsuDL3EKMkB5OSKG9UuHCAEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHenYJA\r
  55         Od6UxMqq1KJ8mJQ0B4uSOO/1lJv+QgLpiSWp2ampBalFMFkZDg4lCd7tmUCNgkWp6akVaZk5\r
  56         JQhpJg5OkOE8QMPXgNTwFhck5hZnpkPkTzEqSonzPgZJCIAkMkrz4HphCeEVozjQK8K810Cq\r
  57         eIDJBK77FdBgJqDBFtFCIINLEhFSUg2Mu1rTbIy/Owt8/GFamRrQpsdwSKlEjl225/9jPbWE\r
  58         2y0O4lZ+hd396wLTJtv/v5zLKTsx/q6pcM716znrIvN/Zr5Z/HvlqppnJp0lXleexkj7sApa\r
  59         F4nZV8Ts+PNePcTazfLtnT83WK9t7eaa9ZRF4KvH0d0Lflz7VfXju0jQ+XMzf7+083JRYinO\r
  60         SDTUYi4qTgQAACgfkOMCAAA=\r
  61 Cc: tomi.ollila@iki.fi\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Sat, 28 Jul 2012 04:29:44 -0000\r
  75 \r
  76 The message_set_{begin,sep,end} and null_message fields are no longer\r
  77 used because we now use the structure printer provided by the format.\r
  78 ---\r
  79  notmuch-client.h |    4 ----\r
  80  notmuch-show.c   |    4 ----\r
  81  2 files changed, 8 deletions(-)\r
  82 \r
  83 diff --git a/notmuch-client.h b/notmuch-client.h\r
  84 index 21c3231..de31aa1 100644\r
  85 --- a/notmuch-client.h\r
  86 +++ b/notmuch-client.h\r
  87 @@ -71,13 +71,9 @@ struct notmuch_show_params;\r
  88  \r
  89  typedef struct notmuch_show_format {\r
  90      sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream);\r
  91 -    const char *message_set_start;\r
  92      notmuch_status_t (*part) (const void *ctx, sprinter_t *sprinter,\r
  93                               struct mime_node *node, int indent,\r
  94                               const struct notmuch_show_params *params);\r
  95 -    const char *message_set_sep;\r
  96 -    const char *message_set_end;\r
  97 -    const char *null_message;\r
  98  } notmuch_show_format_t;\r
  99  \r
 100  typedef struct notmuch_crypto {\r
 101 diff --git a/notmuch-show.c b/notmuch-show.c\r
 102 index 89bf2e7..3556293 100644\r
 103 --- a/notmuch-show.c\r
 104 +++ b/notmuch-show.c\r
 105 @@ -37,11 +37,7 @@ format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
 106  \r
 107  static const notmuch_show_format_t format_json = {\r
 108      .new_sprinter = sprinter_json_create,\r
 109 -    .message_set_start = "[",\r
 110      .part = format_part_json_entry,\r
 111 -    .message_set_sep = ", ",\r
 112 -    .message_set_end = "]",\r
 113 -    .null_message = "null"\r
 114  };\r
 115  \r
 116  static notmuch_status_t\r
 117 -- \r
 118 1.7.10\r
 119 \r