tools: bpftool: turn err() and info() macros into functions

Browse source

Turn err() and info() macros into functions.

In order to avoid naming conflicts with variables in the code, rename
them as p_err() and p_info() respectively.

The behavior of these functions is similar to the one of the macros for
plain output. However, when JSON output is requested, these macros
return a JSON-formatted "error" object instead of printing a message to
stderr.

To handle error messages correctly with JSON, a modification was brought
to their behavior nonetheless: the functions now append a end-of-line
character at the end of the message. This way, we can remove end-of-line
characters at the end of the argument strings, and not have them in the
JSON output.

All error messages are formatted to hold in a single call to p_err(), in
order to produce a single JSON field.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Quentin Monnet 2017-10-23 09:24:13 -07:00 • committed by David S. Miller

parent 3aaca6bf7a

commit 9a5ab8bf1d

5 changed files with 126 additions and 91 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

26

tools/bpf/bpftool/common.c

View file

16

tools/bpf/bpftool/main.c

View file

37

tools/bpf/bpftool/main.h

View file

87

tools/bpf/bpftool/map.c

View file

51

tools/bpf/bpftool/prog.c

View file