From: Mark Walters <markwalters1009@gmail.com>
To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org
Subject: Re: [PATCH] cli: Remove now-unused json.c
In-Reply-To: <1344344667-19114-1-git-send-email-amdragon@mit.edu>
References: <1344344667-19114-1-git-send-email-amdragon@mit.edu>
User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1
	(x86_64-pc-linux-gnu)
Date: Tue, 07 Aug 2012 17:00:49 +0100
Message-ID: <87hasebsjy.fsf@qmul.ac.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list


+1

Mark

On Tue, 07 Aug 2012, Austin Clements <amdragon@MIT.EDU> wrote:
> 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 =3D		\
>  	query-string.c		\
>  	mime-node.c		\
>  	crypto.c		\
> -	json.c
>=20=20
>  notmuch_client_modules =3D $(notmuch_client_srcs:.c=3D.o)
>=20=20
> 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 =C2=A9 2009 Dave Gamble
> - * Copyright =C2=A9 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 <scott@quadhome.com>
> - *
> - */
> -
> -#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 includ=
ed in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRE=
SS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI=
TY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHA=
LL THE
> - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISI=
NG FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALING=
S 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 =3D 0, required =3D 0, ptr =3D str;
> -	 loop < len;
> -	 loop++, required++, ptr++) {
> -	if ((unsigned char)(*ptr) < 32 || *ptr =3D=3D '\"' || *ptr =3D=3D '\\')
> -	    required++;
> -    }
> -
> -    /*
> -     * + 3 for:
> -     * - leading quotation mark,
> -     * - trailing quotation mark,
> -     * - trailing NULL.
> -     */
> -    out =3D talloc_array (ctx, char, required + 3);
> -
> -    ptr =3D str;
> -    ptr2 =3D out;
> -
> -    *ptr2++ =3D '\"';
> -    for (loop =3D 0; loop < len; loop++) {
> -	if ((unsigned char)(*ptr) > 31 && *ptr !=3D '\"' && *ptr !=3D '\\') {
> -		*ptr2++ =3D *ptr++;
> -	    } else {
> -		*ptr2++ =3D '\\';
> -		switch (*ptr++) {
> -		    case '\"':	*ptr2++ =3D '\"';	break;
> -		    case '\\':	*ptr2++ =3D '\\';	break;
> -		    case '\b':	*ptr2++ =3D 'b';	break;
> -		    case '\f':	*ptr2++ =3D 'f';	break;
> -		    case '\n':	*ptr2++ =3D 'n';	break;
> -		    case '\r':	*ptr2++ =3D 'r';	break;
> -		    case '\t':	*ptr2++ =3D 't';	break;
> -		    default:	 ptr2--;	break;
> -		}
> -	    }
> -    }
> -    *ptr2++ =3D '\"';
> -    *ptr2++ =3D '\0';
> -
> -    return out;
> -}
> -
> -char *
> -json_quote_str(const void *ctx, const char *str)
> -{
> -    if (str =3D=3D NULL)
> -	str =3D "";
> -
> -    return (json_quote_chararray (ctx, str, strlen (str)));
> -}
> --=20
> 1.7.10
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch