forked from Minki/linux
64cf548126
Precise and non-ambiguous license information is important. The recent
relicensing of the bpftools introduced a license conflict.
The files have now:
SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
and
* 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
* 2 of the License, or (at your option) any later version
Amazingly about 20 people acked that change and neither they nor the
committer noticed. Oh well.
Digging deeper: The files were imported from the iproute2 repository with
the GPL V2 or later boiler plate text in commit b66e907cfe ("tools:
bpftool: copy JSON writer from iproute2 repository")
Looking at the iproute2 repository at
git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
the following commit is the equivivalent:
commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")
That commit explicitly removes the boiler plate and relicenses the code
uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
also the relicensing commit, it's assumed that the relicensing was intended
to do exaclty that. Just the kernel side update failed to remove the boiler
plate. Do so now.
Fixes: 907b223651 ("tools: bpftool: dual license all files")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: YueHaibing <yuehaibing@huawei.com>
Cc: Yonghong Song <yhs@fb.com>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Sean Young <sean@mess.org>
Cc: Jiri Benc <jbenc@redhat.com>
Cc: David Calavera <david.calavera@gmail.com>
Cc: Andrey Ignatov <rdna@fb.com>
Cc: Joe Stringer <joe@wand.net.nz>
Cc: David Ahern <dsahern@gmail.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Petar Penkov <ppenkov@stanford.edu>
Cc: Sandipan Das <sandipan@linux.ibm.com>
Cc: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Quentin Monnet <quentin.monnet@netronome.com>
CC: okash.khawaja@gmail.com
Cc: netdev@vger.kernel.org
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
69 lines
2.5 KiB
C
69 lines
2.5 KiB
C
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
|
|
/*
|
|
* Simple streaming JSON writer
|
|
*
|
|
* This takes care of the annoying bits of JSON syntax like the commas
|
|
* after elements
|
|
*
|
|
* Authors: Stephen Hemminger <stephen@networkplumber.org>
|
|
*/
|
|
|
|
#ifndef _JSON_WRITER_H_
|
|
#define _JSON_WRITER_H_
|
|
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <stdarg.h>
|
|
|
|
/* Opaque class structure */
|
|
typedef struct json_writer json_writer_t;
|
|
|
|
/* Create a new JSON stream */
|
|
json_writer_t *jsonw_new(FILE *f);
|
|
/* End output to JSON stream */
|
|
void jsonw_destroy(json_writer_t **self_p);
|
|
|
|
/* Cause output to have pretty whitespace */
|
|
void jsonw_pretty(json_writer_t *self, bool on);
|
|
|
|
/* Add property name */
|
|
void jsonw_name(json_writer_t *self, const char *name);
|
|
|
|
/* Add value */
|
|
void jsonw_vprintf_enquote(json_writer_t *self, const char *fmt, va_list ap);
|
|
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);
|
|
void jsonw_end_object(json_writer_t *self);
|
|
|
|
void jsonw_start_array(json_writer_t *self);
|
|
void jsonw_end_array(json_writer_t *self);
|
|
|
|
/* Override default exception handling */
|
|
typedef void (jsonw_err_handler_fn)(const char *);
|
|
|
|
#endif /* _JSON_WRITER_H_ */
|