From 1a1aea610f13507f0e49b784923843e9da0ac595 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 8 Aug 2012 09:04:27 +2000 Subject: [PATCH] [PATCH] cli: Remove now-unused json.c --- f3/d618892a89fdacefc1e31756f3d80b7e7a273c | 212 ++++++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 f3/d618892a89fdacefc1e31756f3d80b7e7a273c diff --git a/f3/d618892a89fdacefc1e31756f3d80b7e7a273c b/f3/d618892a89fdacefc1e31756f3d80b7e7a273c new file mode 100644 index 000000000..a418ccbd9 --- /dev/null +++ b/f3/d618892a89fdacefc1e31756f3d80b7e7a273c @@ -0,0 +1,212 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id EF1AC431FC4 + for ; Tue, 7 Aug 2012 06:04:31 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id EIOUZoYPh7T5 for ; + Tue, 7 Aug 2012 06:04:31 -0700 (PDT) +Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU + [18.9.25.12]) + by olra.theworths.org (Postfix) with ESMTP id EECDB431FAF + for ; Tue, 7 Aug 2012 06:04:30 -0700 (PDT) +X-AuditID: 1209190c-b7f806d000006b87-6e-5021125ee925 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP + id AD.73.27527.E5211205; Tue, 7 Aug 2012 09:04:30 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q77D4U5v020247; + Tue, 7 Aug 2012 09:04:30 -0400 +Received: from drake.dyndns.org + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q77D4ToW005363 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 7 Aug 2012 09:04:30 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1SyjSX-0004zB-2v; Tue, 07 Aug 2012 09:04:29 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: =?UTF-8?q?=5BPATCH=5D=20cli=3A=20Remove=20now-unused=20json=2Ec?= +Date: Tue, 7 Aug 2012 09:04:27 -0400 +Message-Id: <1344344667-19114-1-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsUixG6nrhsnpBhgMOecisX1mzOZHRg9nq26 + xRzAGMVlk5Kak1mWWqRvl8CVsebEJ6aCG0oVe07MY21gXCzVxcjJISFgIrFm5yMmCFtM4sK9 + 9WxdjFwcQgL7GCWWzm1nBkkICaxnlHj0lQUi8ZBJYv3dxewQzlxGiZkbz4C1swloSGzbv5wR + xBYRkJbYeXc2axcjBwezgJrEny4VEFNYwEvi5QdtkAoWAVWJNUdvsoLYvAIOEgcvTWKGOEJe + 4un9PjaIuKDEyZlPWCCmqEusnycEEmYGKmneOpt5AqPALCRVsxCqZiGpWsDIvIpRNiW3Sjc3 + MTOnODVZtzg5MS8vtUjXUC83s0QvNaV0EyMoHDkleXYwvjmodIhRgINRiYf3ApdCgBBrYllx + Ze4hRkkOJiVRXmE+xQAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIryHdwKV86YkVlalFuXDpKQ5 + WJTEeS+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8M4RBBoqWJSanlqRlplTgpBm4uAEGc4DNHwF + SA1vcUFibnFmOkT+FKMux8wfT24zCrHk5eelSonzTgYpEgApyijNg5sDSyOvGMWB3hLmPQBS + xQNMQXCTXgEtYQJa4i0vB7KkJBEhJdXAuObraru100q0tNS0VJb9ihDjmr/JsNZla8jrnWuC + Sjyn7O+v58iWSn7m1MOwQ2NJTenNM2EdQezXy7Ve612+JZt18Xp34eb6s5KT+5XZeP6dLlOR + +DPngklEqFLHype88YE/Yr6Zb5lSUNy1cf1RlpAZdix5NXzh1Uc/nrr4pNJt+smZ08KilViK + MxINtZiLihMBiZ2Rh/4CAAA= +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 07 Aug 2012 13:04:32 -0000 + +The string buffer quoting functions in json.c have been superseded by +the new sprinter interface and are no longer used. Remove them. +--- + Makefile.local | 1 - + json.c | 109 -------------------------------------------------------- + 2 files changed, 110 deletions(-) + delete mode 100644 json.c + +diff --git a/Makefile.local b/Makefile.local +index b3b960c..de984ab 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -294,7 +294,6 @@ notmuch_client_srcs = \ + query-string.c \ + mime-node.c \ + crypto.c \ +- json.c + + notmuch_client_modules = $(notmuch_client_srcs:.c=.o) + +diff --git a/json.c b/json.c +deleted file mode 100644 +index 817fc83..0000000 +--- a/json.c ++++ /dev/null +@@ -1,109 +0,0 @@ +-/* notmuch - Not much of an email program, (just index and search) +- * +- * Copyright © 2009 Dave Gamble +- * Copyright © 2009 Scott Robinson +- * +- * This program is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see http://www.gnu.org/licenses/ . +- * +- * Authors: Dave Gamble +- * Scott Robinson +- * +- */ +- +-#include "notmuch-client.h" +- +-/* This function was derived from the print_string_ptr function of +- * cJSON (http://cjson.sourceforge.net/) and is used by permission of +- * the following license: +- * +- * Copyright (c) 2009 Dave Gamble +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +- +-char * +-json_quote_chararray(const void *ctx, const char *str, const size_t len) +-{ +- const char *ptr; +- char *ptr2; +- char *out; +- size_t loop; +- size_t required; +- +- for (loop = 0, required = 0, ptr = str; +- loop < len; +- loop++, required++, ptr++) { +- if ((unsigned char)(*ptr) < 32 || *ptr == '\"' || *ptr == '\\') +- required++; +- } +- +- /* +- * + 3 for: +- * - leading quotation mark, +- * - trailing quotation mark, +- * - trailing NULL. +- */ +- out = talloc_array (ctx, char, required + 3); +- +- ptr = str; +- ptr2 = out; +- +- *ptr2++ = '\"'; +- for (loop = 0; loop < len; loop++) { +- if ((unsigned char)(*ptr) > 31 && *ptr != '\"' && *ptr != '\\') { +- *ptr2++ = *ptr++; +- } else { +- *ptr2++ = '\\'; +- switch (*ptr++) { +- case '\"': *ptr2++ = '\"'; break; +- case '\\': *ptr2++ = '\\'; break; +- case '\b': *ptr2++ = 'b'; break; +- case '\f': *ptr2++ = 'f'; break; +- case '\n': *ptr2++ = 'n'; break; +- case '\r': *ptr2++ = 'r'; break; +- case '\t': *ptr2++ = 't'; break; +- default: ptr2--; break; +- } +- } +- } +- *ptr2++ = '\"'; +- *ptr2++ = '\0'; +- +- return out; +-} +- +-char * +-json_quote_str(const void *ctx, const char *str) +-{ +- if (str == NULL) +- str = ""; +- +- return (json_quote_chararray (ctx, str, strlen (str))); +-} +-- +1.7.10 + -- 2.26.2