--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 EF1AC431FC4\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 06:04:31 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 EIOUZoYPh7T5 for <notmuch@notmuchmail.org>;\r
+ Tue, 7 Aug 2012 06:04:31 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+ [18.9.25.12])\r
+ by olra.theworths.org (Postfix) with ESMTP id EECDB431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 7 Aug 2012 06:04:30 -0700 (PDT)\r
+X-AuditID: 1209190c-b7f806d000006b87-6e-5021125ee925\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id AD.73.27527.E5211205; Tue, 7 Aug 2012 09:04:30 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q77D4U5v020247; \r
+ Tue, 7 Aug 2012 09:04:30 -0400\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q77D4ToW005363\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 7 Aug 2012 09:04:30 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1SyjSX-0004zB-2v; Tue, 07 Aug 2012 09:04:29 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: =?UTF-8?q?=5BPATCH=5D=20cli=3A=20Remove=20now-unused=20json=2Ec?=\r
+Date: Tue, 7 Aug 2012 09:04:27 -0400\r
+Message-Id: <1344344667-19114-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsUixG6nrhsnpBhgMOecisX1mzOZHRg9nq26\r
+ xRzAGMVlk5Kak1mWWqRvl8CVsebEJ6aCG0oVe07MY21gXCzVxcjJISFgIrFm5yMmCFtM4sK9\r
+ 9WxdjFwcQgL7GCWWzm1nBkkICaxnlHj0lQUi8ZBJYv3dxewQzlxGiZkbz4C1swloSGzbv5wR\r
+ xBYRkJbYeXc2axcjBwezgJrEny4VEFNYwEvi5QdtkAoWAVWJNUdvsoLYvAIOEgcvTWKGOEJe\r
+ 4un9PjaIuKDEyZlPWCCmqEusnycEEmYGKmneOpt5AqPALCRVsxCqZiGpWsDIvIpRNiW3Sjc3\r
+ MTOnODVZtzg5MS8vtUjXUC83s0QvNaV0EyMoHDkleXYwvjmodIhRgINRiYf3ApdCgBBrYllx\r
+ Ze4hRkkOJiVRXmE+xQAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIryHdwKV86YkVlalFuXDpKQ5\r
+ WJTEeS+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8M4RBBoqWJSanlqRlplTgpBm4uAEGc4DNHwF\r
+ SA1vcUFibnFmOkT+FKMux8wfT24zCrHk5eelSonzTgYpEgApyijNg5sDSyOvGMWB3hLmPQBS\r
+ xQNMQXCTXgEtYQJa4i0vB7KkJBEhJdXAuObraru100q0tNS0VJb9ihDjmr/JsNZla8jrnWuC\r
+ Sjyn7O+v58iWSn7m1MOwQ2NJTenNM2EdQezXy7Ve612+JZt18Xp34eb6s5KT+5XZeP6dLlOR\r
+ +DPngklEqFLHype88YE/Yr6Zb5lSUNy1cf1RlpAZdix5NXzh1Uc/nrr4pNJt+smZ08KilViK\r
+ MxINtZiLihMBiZ2Rh/4CAAA=\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 13:04:32 -0000\r
+\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
+ 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 = \\r
+ query-string.c \\r
+ mime-node.c \\r
+ crypto.c \\r
+- json.c\r
+ \r
+ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)\r
+ \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 © 2009 Dave Gamble\r
+- * Copyright © 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 a copy\r
+- * of this software and associated documentation files (the "Software"), to deal\r
+- * in the Software without restriction, including without limitation the rights\r
+- * to use, copy, modify, merge, publish, distribute, sublicense, and/or 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 included in\r
+- * all copies or substantial portions of the Software.\r
+- *\r
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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, ARISING FROM,\r
+- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 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 = 0, required = 0, ptr = str;\r
+- loop < len;\r
+- loop++, required++, ptr++) {\r
+- if ((unsigned char)(*ptr) < 32 || *ptr == '\"' || *ptr == '\\')\r
+- required++;\r
+- }\r
+-\r
+- /*\r
+- * + 3 for:\r
+- * - leading quotation mark,\r
+- * - trailing quotation mark,\r
+- * - trailing NULL.\r
+- */\r
+- out = talloc_array (ctx, char, required + 3);\r
+-\r
+- ptr = str;\r
+- ptr2 = out;\r
+-\r
+- *ptr2++ = '\"';\r
+- for (loop = 0; loop < len; loop++) {\r
+- if ((unsigned char)(*ptr) > 31 && *ptr != '\"' && *ptr != '\\') {\r
+- *ptr2++ = *ptr++;\r
+- } else {\r
+- *ptr2++ = '\\';\r
+- switch (*ptr++) {\r
+- case '\"': *ptr2++ = '\"'; break;\r
+- case '\\': *ptr2++ = '\\'; break;\r
+- case '\b': *ptr2++ = 'b'; break;\r
+- case '\f': *ptr2++ = 'f'; break;\r
+- case '\n': *ptr2++ = 'n'; break;\r
+- case '\r': *ptr2++ = 'r'; break;\r
+- case '\t': *ptr2++ = 't'; break;\r
+- default: ptr2--; break;\r
+- }\r
+- }\r
+- }\r
+- *ptr2++ = '\"';\r
+- *ptr2++ = '\0';\r
+-\r
+- return out;\r
+-}\r
+-\r
+-char *\r
+-json_quote_str(const void *ctx, const char *str)\r
+-{\r
+- if (str == NULL)\r
+- str = "";\r
+-\r
+- return (json_quote_chararray (ctx, str, strlen (str)));\r
+-}\r
+-- \r
+1.7.10\r
+\r
projects / notmuch-archives.git / commitdiff