tools: bpftool: clean up the JSON writer before exiting in usage()
authorQuentin Monnet <quentin.monnet@netronome.com>
Wed, 29 Nov 2017 01:44:29 +0000 (17:44 -0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 30 Nov 2017 01:09:29 +0000 (02:09 +0100)
commit7868620a3c15dbc661fb5d849de403ac04624c50
tree3f70a2a36787da1f70f04e44c974c72ab22a07ad
parent9b85c2d4508563f4bb1de0d971ed02fea0d0d757
tools: bpftool: clean up the JSON writer before exiting in usage()

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: d35efba99d92 ("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>
tools/bpf/bpftool/main.c
tools/bpf/bpftool/main.h