From patchwork Thu Aug 17 17:35:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Fortin X-Patchwork-Id: 802790 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="NFhrEPk5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYD542s93z9t4Z for ; Fri, 18 Aug 2017 03:40:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753444AbdHQRkW (ORCPT ); Thu, 17 Aug 2017 13:40:22 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:38409 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753393AbdHQRkU (ORCPT ); Thu, 17 Aug 2017 13:40:20 -0400 Received: by mail-wr0-f173.google.com with SMTP id 5so25401074wrz.5 for ; Thu, 17 Aug 2017 10:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TQZAGzeN1rmSL8M1qrcMtyjKHG1Q4rVFvUdHmOwS6Sc=; b=NFhrEPk5BmyQp8WeKorfw4zffzsEIHqY7OiYlSC8l6kbwpYfVJxNRrojGZOhF4/Uok QXnAKStWhB0jJpWeG3WoIbrs/GwccbI1OHlREAPoKy+Z+3EB9ui+3PjoLc73zWx93d85 HzOdBX2tJDRxNNie5KA8n+BAk3axhydQlEEbU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TQZAGzeN1rmSL8M1qrcMtyjKHG1Q4rVFvUdHmOwS6Sc=; b=dd6UN0dEyAcPTZIjG636VAjjx8vZ62gwczw7Xm1cBLDlHusrl5Nw/Atltwmocwjfas DdzP1nFIK3JY6mcKXrYXtiD8rPCOk0FCCo75p+kb6P9JFiHwMXab/2dBKItjjYppX8Io Yd1735Qk2PNjXjemSpmSKAHtQjVWGIX4k36FlkXxZkGCwwlh1c+dvqDvjbxxH+pA24Rw xjqeDqAXigNDF4zWF30K9iKVACojT4glrgxBevmwokK0pQdmdZdC87MclWoOvSCYDS3m +sZkAymw51ay6VEjGXxCp0QGro6UtQx1zqpv0xvZ1MRi1n7T4O6nuuhuERMlx4QbJxi+ zwqA== X-Gm-Message-State: AHYfb5iKxR8ZQ1eIfkW9to1TIxCxB8BNU/dcr1Z9hToR1grcPLK46rU9 jCgsKYIh/OmJdqHE21VKaq5f X-Received: by 10.28.22.143 with SMTP id 137mr1919185wmw.68.1502991619021; Thu, 17 Aug 2017 10:40:19 -0700 (PDT) Received: from localhost.localdomain ([37.169.21.172]) by smtp.googlemail.com with ESMTPSA id k13sm3902040wrd.4.2017.08.17.10.40.15 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 Aug 2017 10:40:18 -0700 (PDT) From: Julien Fortin X-Google-Original-From: Julien Fortin To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, dsa@cumulusnetworks.com, Julien Fortin Subject: [PATCH iproute2 json v2 03/27] json_writer: add new json handlers (null, float with format, lluint, hu) Date: Thu, 17 Aug 2017 10:35:50 -0700 Message-Id: <20170817173614.54987-4-julien@cumulusnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170817173614.54987-1-julien@cumulusnetworks.com> References: <20170817173614.54987-1-julien@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Julien Fortin Signed-off-by: Julien Fortin --- include/json_writer.h | 9 +++++++++ lib/json_writer.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/include/json_writer.h b/include/json_writer.h index ab9a008a..1516aafb 100644 --- a/include/json_writer.h +++ b/include/json_writer.h @@ -33,20 +33,29 @@ void jsonw_pretty(json_writer_t *self, bool on); void jsonw_name(json_writer_t *self, const char *name); /* Add value */ +void jsonw_printf(json_writer_t *self, const char *fmt, ...); void jsonw_string(json_writer_t *self, const char *value); void jsonw_bool(json_writer_t *self, bool value); void jsonw_float(json_writer_t *self, double number); +void jsonw_float_fmt(json_writer_t *self, const char *fmt, double num); void jsonw_uint(json_writer_t *self, uint64_t number); +void jsonw_hu(json_writer_t *self, unsigned short number); void jsonw_int(json_writer_t *self, int64_t number); void jsonw_null(json_writer_t *self); +void jsonw_lluint(json_writer_t *self, unsigned long long int num); /* Useful Combinations of name and value */ void jsonw_string_field(json_writer_t *self, const char *prop, const char *val); void jsonw_bool_field(json_writer_t *self, const char *prop, bool value); void jsonw_float_field(json_writer_t *self, const char *prop, double num); void jsonw_uint_field(json_writer_t *self, const char *prop, uint64_t num); +void jsonw_hu_field(json_writer_t *self, const char *prop, unsigned short num); void jsonw_int_field(json_writer_t *self, const char *prop, int64_t num); void jsonw_null_field(json_writer_t *self, const char *prop); +void jsonw_lluint_field(json_writer_t *self, const char *prop, + unsigned long long int num); +void jsonw_float_field_fmt(json_writer_t *self, const char *prop, + const char *fmt, double val); /* Collections */ void jsonw_start_object(json_writer_t *self); diff --git a/lib/json_writer.c b/lib/json_writer.c index 9fc05e96..6b77d288 100644 --- a/lib/json_writer.c +++ b/lib/json_writer.c @@ -156,7 +156,7 @@ void jsonw_name(json_writer_t *self, const char *name) putc(' ', self->out); } -static void jsonw_printf(json_writer_t *self, const char *fmt, ...) +void jsonw_printf(json_writer_t *self, const char *fmt, ...) { va_list ap; @@ -199,23 +199,38 @@ void jsonw_bool(json_writer_t *self, bool val) jsonw_printf(self, "%s", val ? "true" : "false"); } -#ifdef notused void jsonw_null(json_writer_t *self) { jsonw_printf(self, "null"); } +void jsonw_float_fmt(json_writer_t *self, const char *fmt, double num) +{ + jsonw_printf(self, fmt, num); +} + +#ifdef notused void jsonw_float(json_writer_t *self, double num) { jsonw_printf(self, "%g", num); } #endif +void jsonw_hu(json_writer_t *self, unsigned short num) +{ + jsonw_printf(self, "%hu", num); +} + void jsonw_uint(json_writer_t *self, uint64_t num) { jsonw_printf(self, "%"PRIu64, num); } +void jsonw_lluint(json_writer_t *self, unsigned long long int num) +{ + jsonw_printf(self, "%llu", num); +} + void jsonw_int(json_writer_t *self, int64_t num) { jsonw_printf(self, "%"PRId64, num); @@ -242,25 +257,46 @@ void jsonw_float_field(json_writer_t *self, const char *prop, double val) } #endif +void jsonw_float_field_fmt(json_writer_t *self, + const char *prop, + const char *fmt, + double val) +{ + jsonw_name(self, prop); + jsonw_float_fmt(self, fmt, val); +} + void jsonw_uint_field(json_writer_t *self, const char *prop, uint64_t num) { jsonw_name(self, prop); jsonw_uint(self, num); } +void jsonw_hu_field(json_writer_t *self, const char *prop, unsigned short num) +{ + jsonw_name(self, prop); + jsonw_hu(self, num); +} + +void jsonw_lluint_field(json_writer_t *self, + const char *prop, + unsigned long long int num) +{ + jsonw_name(self, prop); + jsonw_lluint(self, num); +} + void jsonw_int_field(json_writer_t *self, const char *prop, int64_t num) { jsonw_name(self, prop); jsonw_int(self, num); } -#ifdef notused void jsonw_null_field(json_writer_t *self, const char *prop) { jsonw_name(self, prop); jsonw_null(self); } -#endif #ifdef TEST int main(int argc, char **argv)