Merge branch 'bpf-bpftool-json-fixes'

Browse source

Quentin Monnet says:

====================
These are two minor fixes to avoid breaking JSON output in batch mode. The
first one makes bpftool output a "null" JSON object, as expected in batch
mode if nothing else is to be printed, when dumping program instructions
into an output file. The second one replaces a call to "perror()" with
something that does not break JSON when parsing input file for batch mode.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2018-02-15 10:01:06 +01:00

parent 9c481b908b 9be6d411b0

commit 67e3a172eb

2 changed files with 4 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

tools/bpf/bpftool/main.c

View file

3

tools/bpf/bpftool/prog.c

View file