19/fc47688dfdad718279bab314292c4d91e783a1

   1 Return-Path: <amthrax@drake.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 59FC9429E3F\r
   6         for <notmuch@notmuchmail.org>; Fri, 23 Dec 2011 19:45:59 -0800 (PST)\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 4RPRpFjdFGrv for <notmuch@notmuchmail.org>;\r
  16         Fri, 23 Dec 2011 19:45:58 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id B8607429E30\r
  20         for <notmuch@notmuchmail.org>; Fri, 23 Dec 2011 19:45:58 -0800 (PST)\r
  21 X-AuditID: 1209190d-b7f576d0000008c4-77-4ef54af64fae\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id A3.33.02244.6FA45FE4; Fri, 23 Dec 2011 22:45:58 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id pBO3jvK6015205; \r
  27         Fri, 23 Dec 2011 22:45:57 -0500\r
  28 Received: from drake.mit.edu (c-76-21-105-205.hsd1.ca.comcast.net\r
  29         [76.21.105.205]) (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id pBO3jtqD017805\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Fri, 23 Dec 2011 22:45:56 -0500 (EST)\r
  34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amthrax@drake.mit.edu>)\r
  36         id 1ReIYV-0007I5-0z; Fri, 23 Dec 2011 22:45:55 -0500\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v4 1/4] show: Pass notmuch_message_t instead of path to\r
  40         show_message_body.\r
  41 Date: Fri, 23 Dec 2011 22:45:45 -0500\r
  42 Message-Id: <1324698348-27620-2-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1324698348-27620-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1323460468-4030-1-git-send-email-amdragon@mit.edu>\r
  46         <1324698348-27620-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixG6nrvvN66ufwZRtvBbXb85kdmD0eLbq\r
  49         FnMAYxSXTUpqTmZZapG+XQJXxo+3S9kK2oQqVry9x9LAeJWvi5GDQ0LAROLA5qAuRk4gU0zi\r
  50         wr31bF2MXBxCAvsYJS4sf8MM4WxglHjx5SArSJWQwDkmia+bfSAS8xklVvQeBUuwCWhIbNu/\r
  51         nBHEFhGQlth5dzYryAZmATWJP10qIGFhgSiJ5pNPwUpYBFQlfl/8zQRi8wo4SHzZeI0d4goF\r
  52         iXOrz4HZnAKOElu3vmcEGSMkUCbRfCZoAiP/AkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbpG\r
  53         ermZJXqpKaWbGEEBwynJu4Px3UGlQ4wCHIxKPLyNS7/4CbEmlhVX5h5ilORgUhLlver21U+I\r
  54         Lyk/pTIjsTgjvqg0J7X4EKMEB7OSCK9mElA5b0piZVVqUT5MSpqDRUmcV1XrnZ+QQHpiSWp2\r
  55         ampBahFMVoaDQ0mCNxoYGUKCRanpqRVpmTklCGkmDk6Q4TxAw91AaniLCxJzizPTIfKnGBWl\r
  56         xHmzQBICIImM0jy4XlhEv2IUB3pFmDcQpIoHmAzgul8BDWYCGhxjBHJ1cUkiQkqqgVGzWT33\r
  57         37fr0/bqsdlqL35Y9MxM57J0pdw2/WkPX4gp31i04uzzmvaAlGyJHH8/ocSZTL1HpvM1J0zm\r
  58         ks8Rt2vVZTOxsyzLczAPqeS7dK9eKNF69aUumamPr/V9DJmvGqE/Z1vLpQ37Qzt6XCYKZDke\r
  59         e2NywdHg85SCB1193lyTv23U+8B4Q4mlOCPRUIu5qDgRAH20j1nDAgAA\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Sat, 24 Dec 2011 03:45:59 -0000\r
  73 \r
  74 In addition to simplifying the code, we'll need the notmuch_message_t*\r
  75 in show_message_body shortly.\r
  76 ---\r
  77  notmuch-client.h |    2 +-\r
  78  notmuch-reply.c  |    3 +--\r
  79  notmuch-show.c   |    3 +--\r
  80  show-message.c   |    3 ++-\r
  81  4 files changed, 5 insertions(+), 6 deletions(-)\r
  82 \r
  83 diff --git a/notmuch-client.h b/notmuch-client.h\r
  84 index c602e2e..c521efa 100644\r
  85 --- a/notmuch-client.h\r
  86 +++ b/notmuch-client.h\r
  87 @@ -162,7 +162,7 @@ char *\r
  88  query_string_from_args (void *ctx, int argc, char *argv[]);\r
  89  \r
  90  notmuch_status_t\r
  91 -show_message_body (const char *filename,\r
  92 +show_message_body (notmuch_message_t *message,\r
  93                    const notmuch_show_format_t *format,\r
  94                    notmuch_show_params_t *params);\r
  95  \r
  96 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  97 index 7ac879f..f8d5f64 100644\r
  98 --- a/notmuch-reply.c\r
  99 +++ b/notmuch-reply.c\r
 100 @@ -546,8 +546,7 @@ notmuch_reply_format_default(void *ctx,\r
 101                 notmuch_message_get_header (message, "date"),\r
 102                 notmuch_message_get_header (message, "from"));\r
 103  \r
 104 -       show_message_body (notmuch_message_get_filename (message),\r
 105 -                          format, params);\r
 106 +       show_message_body (message, format, params);\r
 107  \r
 108         notmuch_message_destroy (message);\r
 109      }\r
 110 diff --git a/notmuch-show.c b/notmuch-show.c\r
 111 index 19fb49f..0200b9c 100644\r
 112 --- a/notmuch-show.c\r
 113 +++ b/notmuch-show.c\r
 114 @@ -758,8 +758,7 @@ show_message (void *ctx,\r
 115      }\r
 116  \r
 117      if (format->part_content)\r
 118 -       show_message_body (notmuch_message_get_filename (message),\r
 119 -                          format, params);\r
 120 +       show_message_body (message, format, params);\r
 121  \r
 122      if (params->part <= 0) {\r
 123         fputs (format->body_end, stdout);\r
 124 diff --git a/show-message.c b/show-message.c\r
 125 index d83f04e..09fa607 100644\r
 126 --- a/show-message.c\r
 127 +++ b/show-message.c\r
 128 @@ -175,7 +175,7 @@ show_message_part (GMimeObject *part,\r
 129  }\r
 130  \r
 131  notmuch_status_t\r
 132 -show_message_body (const char *filename,\r
 133 +show_message_body (notmuch_message_t *message,\r
 134                    const notmuch_show_format_t *format,\r
 135                    notmuch_show_params_t *params)\r
 136  {\r
 137 @@ -183,6 +183,7 @@ show_message_body (const char *filename,\r
 138      GMimeParser *parser = NULL;\r
 139      GMimeMessage *mime_message = NULL;\r
 140      notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;\r
 141 +    const char *filename = notmuch_message_get_filename (message);\r
 142      FILE *file = NULL;\r
 143      show_message_state_t state;\r
 144  \r
 145 -- \r
 146 1.7.7.3\r
 147 \r