From: Matthias Tafelmeier <matthias.tafelmeier@gmx.net>
To: netdev@vger.kernel.org
Cc: hagen@jauu.net, shemminger@osdl.org, fw@strlen.de,
edumazet@google.com, daniel@iogearbox.net
Subject: [PATCH v6 10/10] ss: activate json_writer excluded logic
Date: Wed, 9 Sep 2015 21:43:21 +0200 [thread overview]
Message-ID: <1441827801-9617-11-git-send-email-matthias.tafelmeier@gmx.net> (raw)
In-Reply-To: <1441827801-9617-1-git-send-email-matthias.tafelmeier@gmx.net>
This small patch extends the lib json_writer module for formerly
deactivated functionality.
Signed-off-by: Matthias Tafelmeier <matthias.tafelmeier@gmx.net>
---
include/json_writer.h | 1 +
lib/json_writer.c | 7 -------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/json_writer.h b/include/json_writer.h
index ab9a008..3e2bbff 100644
--- a/include/json_writer.h
+++ b/include/json_writer.h
@@ -15,6 +15,7 @@
#ifndef _JSON_WRITER_H_
#define _JSON_WRITER_H_
+#include <stdio.h>
#include <stdbool.h>
#include <stdint.h>
diff --git a/lib/json_writer.c b/lib/json_writer.c
index 2af16e1..dfed4d7 100644
--- a/lib/json_writer.c
+++ b/lib/json_writer.c
@@ -12,7 +12,6 @@
* Authors: Stephen Hemminger <stephen@networkplumber.org>
*/
-#include <stdio.h>
#include <stdbool.h>
#include <stdarg.h>
#include <assert.h>
@@ -201,7 +200,6 @@ 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");
@@ -211,7 +209,6 @@ void jsonw_float(json_writer_t *self, double num)
{
jsonw_printf(self, "%g", num);
}
-#endif
void jsonw_uint(json_writer_t *self, uint64_t num)
{
@@ -236,13 +233,11 @@ void jsonw_bool_field(json_writer_t *self, const char *prop, bool val)
jsonw_bool(self, val);
}
-#ifdef notused
void jsonw_float_field(json_writer_t *self, const char *prop, double val)
{
jsonw_name(self, prop);
jsonw_float(self, val);
}
-#endif
void jsonw_uint_field(json_writer_t *self, const char *prop, uint64_t num)
{
@@ -256,13 +251,11 @@ void jsonw_int_field(json_writer_t *self, const char *prop, int64_t num)
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)
--
1.9.1
next prev parent reply other threads:[~2015-09-09 19:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-09 19:43 iproute2 v6: full ss json support and general output simplification Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 01/10] ss: rooted out ss type declarations for output formatters Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 02/10] ss: created formatters for json and hr Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 03/10] ss: removed obsolet fmt functions Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 04/10] ss: prepare timer for output handler usage Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 05/10] ss: replaced old output with new generic output mechanisms Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 06/10] ss: renaming and export of current_filter Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 07/10] ss: symmetrical subhandler output extension example Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 08/10] ss: symmetrical formatter " Matthias Tafelmeier
2015-09-09 19:43 ` [PATCH v6 09/10] ss: fixed free on local array for valid json output Matthias Tafelmeier
2015-09-09 19:43 ` Matthias Tafelmeier [this message]
[not found] ` <4b7ff1016053461a80465ce8138e12a2@HQ1WP-EXMB11.corp.brocade.com>
2015-09-09 21:30 ` [PATCH v6 02/10] ss: created formatters for json and hr Stephen Hemminger
2015-09-09 22:00 ` Matthias Tafelmeier
[not found] ` <cf829f8ac6ea466eb9bb693350dd3291@HQ1WP-EXMB11.corp.brocade.com>
2015-09-09 22:34 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441827801-9617-11-git-send-email-matthias.tafelmeier@gmx.net \
--to=matthias.tafelmeier@gmx.net \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=hagen@jauu.net \
--cc=netdev@vger.kernel.org \
--cc=shemminger@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).