From owner-svn-soc-all@FreeBSD.ORG Thu May 29 12:12:09 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55E50F21 for ; Thu, 29 May 2014 12:12:09 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4184C2304 for ; Thu, 29 May 2014 12:12:09 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TCC980064161 for ; Thu, 29 May 2014 12:12:09 GMT (envelope-from zkorchev@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s4TCC8rk063985 for svn-soc-all@FreeBSD.org; Thu, 29 May 2014 12:12:08 GMT (envelope-from zkorchev@FreeBSD.org) Date: Thu, 29 May 2014 12:12:08 GMT Message-Id: <201405291212.s4TCC8rk063985@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to zkorchev@FreeBSD.org using -f From: zkorchev@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r268802 - soc2014/zkorchev/freebsd_head/bin/ls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2014 12:12:09 -0000 Author: zkorchev Date: Thu May 29 12:12:08 2014 New Revision: 268802 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268802 Log: Updated the copy of sol files Modified: soc2014/zkorchev/freebsd_head/bin/ls/sol.c soc2014/zkorchev/freebsd_head/bin/ls/sol.h Modified: soc2014/zkorchev/freebsd_head/bin/ls/sol.c ============================================================================== --- soc2014/zkorchev/freebsd_head/bin/ls/sol.c Thu May 29 12:00:04 2014 (r268801) +++ soc2014/zkorchev/freebsd_head/bin/ls/sol.c Thu May 29 12:12:08 2014 (r268802) @@ -9,9 +9,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -97,6 +94,13 @@ return 0; } +int sol_integer(struct sol_stream *restrict stream, long long value) +{ + yajl_gen_integer(stream->ctx.g, value); + + return 0; +} + int sol_map_start(struct sol_stream *restrict stream) { yajl_gen_map_open(stream->ctx.g); @@ -135,8 +139,17 @@ { // TODO error if key is expected? - // TODO ?handle special characters yajl_gen_integer(stream->ctx.g, value); return 0; } + +int sol_map_float(struct sol_stream *restrict stream, double value) +{ + // TODO error if key is expected? + + // TODO round mantissa? + yajl_gen_double(stream->ctx.g, value); + + return 0; +} Modified: soc2014/zkorchev/freebsd_head/bin/ls/sol.h ============================================================================== --- soc2014/zkorchev/freebsd_head/bin/ls/sol.h Thu May 29 12:00:04 2014 (r268801) +++ soc2014/zkorchev/freebsd_head/bin/ls/sol.h Thu May 29 12:12:08 2014 (r268802) @@ -1,3 +1,28 @@ +/*- + * Copyright (c) 2014 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #include // libyajl enum sol_format @@ -20,6 +45,7 @@ int sol_array_start(struct sol_stream *restrict stream); int sol_array_end(struct sol_stream *restrict stream); +int sol_integer(struct sol_stream *restrict stream, long long value); int sol_string(struct sol_stream *restrict stream, const char *data, size_t length); int sol_map_start(struct sol_stream *restrict stream); @@ -28,3 +54,4 @@ int sol_map_key(struct sol_stream *restrict stream, const char *key, size_t length); int sol_map_string(struct sol_stream *restrict stream, const char *value, size_t length); int sol_map_integer(struct sol_stream *restrict stream, long long value); +int sol_map_float(struct sol_stream *restrict stream, double value);