tools: bpftool: clean up the JSON writer before exiting in usage()

Browse source

The writer is cleaned at the end of the main function, but not if the
program exits sooner in usage(). Let's keep it clean and destroy the
writer before exiting.

Destruction and actual call to exit() are moved to another function so
that clean exit can also be performed without printing usage() hints.

Fixes: d35efba99d ("tools: bpftool: introduce --json and --pretty options")
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Quentin Monnet 2017-11-28 17:44:29 -08:00 • committed by Daniel Borkmann

parent 9b85c2d450

commit 7868620a3c

2 changed files with 11 additions and 2 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

10

tools/bpf/bpftool/main.c

View file

3

tools/bpf/bpftool/main.h

View file