From owner-svn-soc-all@FreeBSD.ORG Fri Jun 20 09:56:41 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50BDF7D4 for ; Fri, 20 Jun 2014 09:56:41 +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 2215D2B57 for ; Fri, 20 Jun 2014 09:56:41 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5K9uevY071321 for ; Fri, 20 Jun 2014 09:56:40 GMT (envelope-from zkorchev@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5K9ue9J071307 for svn-soc-all@FreeBSD.org; Fri, 20 Jun 2014 09:56:40 GMT (envelope-from zkorchev@FreeBSD.org) Date: Fri, 20 Jun 2014 09:56:40 GMT Message-Id: <201406200956.s5K9ue9J071307@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: r269789 - soc2014/zkorchev/freebsd_head/lib/libsol 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: Fri, 20 Jun 2014 09:56:41 -0000 Author: zkorchev Date: Fri Jun 20 09:56:39 2014 New Revision: 269789 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269789 Log: unsigned integer support Modified: soc2014/zkorchev/freebsd_head/lib/libsol/sol.c soc2014/zkorchev/freebsd_head/lib/libsol/sol.h Modified: soc2014/zkorchev/freebsd_head/lib/libsol/sol.c ============================================================================== --- soc2014/zkorchev/freebsd_head/lib/libsol/sol.c Fri Jun 20 07:35:55 2014 (r269788) +++ soc2014/zkorchev/freebsd_head/lib/libsol/sol.c Fri Jun 20 09:56:39 2014 (r269789) @@ -23,6 +23,7 @@ * SUCH DAMAGE. */ +#include #include #include "sol.h" @@ -123,13 +124,25 @@ return 0; } -int sol_integer(struct sol_stream *restrict stream, long long value) +int sol_integer(struct sol_stream *restrict stream, int64_t value) { yajl_gen_integer(stream->ctx.g, value); return 0; } +int sol_uinteger(struct sol_stream *restrict stream, uint64_t value) // TODO better name for this? +{ + char buffer[20 + 1]; // UINT64_MAX fits in 20 bytes + size_t len; + + // TODO use hex when supported + len = sprintf(buffer, "%" PRIu64, value); + yajl_gen_number(stream->ctx.g, buffer, len); + + return 0; +} + int sol_float(struct sol_stream *restrict stream, double value) { // todo round mantissa? Modified: soc2014/zkorchev/freebsd_head/lib/libsol/sol.h ============================================================================== --- soc2014/zkorchev/freebsd_head/lib/libsol/sol.h Fri Jun 20 07:35:55 2014 (r269788) +++ soc2014/zkorchev/freebsd_head/lib/libsol/sol.h Fri Jun 20 09:56:39 2014 (r269789) @@ -23,6 +23,8 @@ * SUCH DAMAGE. */ +#include + #include // libyajl #define SOL_MAP_KEYL(stream, key) sol_map_key(stream, key, sizeof(key) - 1) @@ -52,6 +54,7 @@ int sol_map_key(struct sol_stream *restrict stream, const char *key, size_t length); int sol_boolean(struct sol_stream *restrict stream, unsigned char value); -int sol_integer(struct sol_stream *restrict stream, long long value); +int sol_integer(struct sol_stream *restrict stream, int64_t value); +int sol_uinteger(struct sol_stream *restrict stream, uint64_t value); int sol_string(struct sol_stream *restrict stream, const char *data, size_t length); int sol_float(struct sol_stream *restrict stream, double value);