--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id CDB60431FC0\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 09:01:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id fNeaj-SMniNn for <notmuch@notmuchmail.org>;\r
+ Tue, 7 Aug 2012 09:00:59 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id A7DC1431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 09:00:59 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SymDJ-0004H7-Og; Tue, 07 Aug 2012 17:00:58 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SymDJ-0002Cf-AQ; Tue, 07 Aug 2012 17:00:57 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] cli: Remove now-unused json.c\r
+In-Reply-To: <1344344667-19114-1-git-send-email-amdragon@mit.edu>\r
+References: <1344344667-19114-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 07 Aug 2012 17:00:49 +0100\r
+Message-ID: <87hasebsjy.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 017434ca916f5c82319bd8c12f417e14 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 07 Aug 2012 16:01:00 -0000\r
+\r
+\r
++1\r
+\r
+Mark\r
+\r
+On Tue, 07 Aug 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> The string buffer quoting functions in json.c have been superseded by\r
+> the new sprinter interface and are no longer used. Remove them.\r
+> ---\r
+> Makefile.local | 1 -\r
+> json.c | 109 --------------------------------------------------=\r
+------\r
+> 2 files changed, 110 deletions(-)\r
+> delete mode 100644 json.c\r
+>\r
+> diff --git a/Makefile.local b/Makefile.local\r
+> index b3b960c..de984ab 100644\r
+> --- a/Makefile.local\r
+> +++ b/Makefile.local\r
+> @@ -294,7 +294,6 @@ notmuch_client_srcs =3D \\r
+> query-string.c \\r
+> mime-node.c \\r
+> crypto.c \\r
+> - json.c\r
+>=20=20\r
+> notmuch_client_modules =3D $(notmuch_client_srcs:.c=3D.o)\r
+>=20=20\r
+> diff --git a/json.c b/json.c\r
+> deleted file mode 100644\r
+> index 817fc83..0000000\r
+> --- a/json.c\r
+> +++ /dev/null\r
+> @@ -1,109 +0,0 @@\r
+> -/* notmuch - Not much of an email program, (just index and search)\r
+> - *\r
+> - * Copyright =C2=A9 2009 Dave Gamble\r
+> - * Copyright =C2=A9 2009 Scott Robinson\r
+> - *\r
+> - * This program is free software: you can redistribute it and/or modify\r
+> - * it under the terms of the GNU General Public License as published by\r
+> - * the Free Software Foundation, either version 3 of the License, or\r
+> - * (at your option) any later version.\r
+> - *\r
+> - * This program is distributed in the hope that it will be useful,\r
+> - * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+> - * GNU General Public License for more details.\r
+> - *\r
+> - * You should have received a copy of the GNU General Public License\r
+> - * along with this program. If not, see http://www.gnu.org/licenses/ .\r
+> - *\r
+> - * Authors: Dave Gamble\r
+> - * Scott Robinson <scott@quadhome.com>\r
+> - *\r
+> - */\r
+> -\r
+> -#include "notmuch-client.h"\r
+> -\r
+> -/* This function was derived from the print_string_ptr function of\r
+> - * cJSON (http://cjson.sourceforge.net/) and is used by permission of\r
+> - * the following license:\r
+> - *\r
+> - * Copyright (c) 2009 Dave Gamble\r
+> - *\r
+> - * Permission is hereby granted, free of charge, to any person obtaining=\r
+ a copy\r
+> - * of this software and associated documentation files (the "Software"),=\r
+ to deal\r
+> - * in the Software without restriction, including without limitation the=\r
+ rights\r
+> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or =\r
+sell\r
+> - * copies of the Software, and to permit persons to whom the Software is\r
+> - * furnished to do so, subject to the following conditions:\r
+> - *\r
+> - * The above copyright notice and this permission notice shall be includ=\r
+ed in\r
+> - * all copies or substantial portions of the Software.\r
+> - *\r
+> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRE=\r
+SS OR\r
+> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI=\r
+TY,\r
+> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHA=\r
+LL THE\r
+> - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
+> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISI=\r
+NG FROM,\r
+> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALING=\r
+S IN\r
+> - * THE SOFTWARE.\r
+> - */\r
+> -\r
+> -char *\r
+> -json_quote_chararray(const void *ctx, const char *str, const size_t len)\r
+> -{\r
+> - const char *ptr;\r
+> - char *ptr2;\r
+> - char *out;\r
+> - size_t loop;\r
+> - size_t required;\r
+> -\r
+> - for (loop =3D 0, required =3D 0, ptr =3D str;\r
+> - loop < len;\r
+> - loop++, required++, ptr++) {\r
+> - if ((unsigned char)(*ptr) < 32 || *ptr =3D=3D '\"' || *ptr =3D=3D '\\')\r
+> - required++;\r
+> - }\r
+> -\r
+> - /*\r
+> - * + 3 for:\r
+> - * - leading quotation mark,\r
+> - * - trailing quotation mark,\r
+> - * - trailing NULL.\r
+> - */\r
+> - out =3D talloc_array (ctx, char, required + 3);\r
+> -\r
+> - ptr =3D str;\r
+> - ptr2 =3D out;\r
+> -\r
+> - *ptr2++ =3D '\"';\r
+> - for (loop =3D 0; loop < len; loop++) {\r
+> - if ((unsigned char)(*ptr) > 31 && *ptr !=3D '\"' && *ptr !=3D '\\') {\r
+> - *ptr2++ =3D *ptr++;\r
+> - } else {\r
+> - *ptr2++ =3D '\\';\r
+> - switch (*ptr++) {\r
+> - case '\"': *ptr2++ =3D '\"'; break;\r
+> - case '\\': *ptr2++ =3D '\\'; break;\r
+> - case '\b': *ptr2++ =3D 'b'; break;\r
+> - case '\f': *ptr2++ =3D 'f'; break;\r
+> - case '\n': *ptr2++ =3D 'n'; break;\r
+> - case '\r': *ptr2++ =3D 'r'; break;\r
+> - case '\t': *ptr2++ =3D 't'; break;\r
+> - default: ptr2--; break;\r
+> - }\r
+> - }\r
+> - }\r
+> - *ptr2++ =3D '\"';\r
+> - *ptr2++ =3D '\0';\r
+> -\r
+> - return out;\r
+> -}\r
+> -\r
+> -char *\r
+> -json_quote_str(const void *ctx, const char *str)\r
+> -{\r
+> - if (str =3D=3D NULL)\r
+> - str =3D "";\r
+> -\r
+> - return (json_quote_chararray (ctx, str, strlen (str)));\r
+> -}\r
+> --=20\r
+> 1.7.10\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff