diff options
author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-01-02 17:48:37 -0500 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-01-04 06:28:46 -0500 |
commit | b4fac96d9a672def4e24c1858adb7e9351471815 (patch) | |
tree | 7ad59b3c1ad348e95e1daab86b444eb0968bbff6 /tools/bpf/bpftool/prog.c | |
parent | 6ebe6dbd6886af07b102aca42e44edbee94a22d9 (diff) |
tools: bpftool: remove new lines from errors
It's a little bit unusual for kernel style, but we add the new line
character to error strings inside the p_err() function. We do this
because new lines at the end of error strings will break JSON output.
Fix a few p_err("..\n") which snuck in recently.
Fixes: 5ccda64d38cc ("bpftool: implement cgroup bpf operations")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
-rw-r--r-- | tools/bpf/bpftool/prog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 5577960bffe4..c6a28be4665c 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c | |||
@@ -813,12 +813,12 @@ static int do_load(int argc, char **argv) | |||
813 | usage(); | 813 | usage(); |
814 | 814 | ||
815 | if (bpf_prog_load(argv[0], BPF_PROG_TYPE_UNSPEC, &obj, &prog_fd)) { | 815 | if (bpf_prog_load(argv[0], BPF_PROG_TYPE_UNSPEC, &obj, &prog_fd)) { |
816 | p_err("failed to load program\n"); | 816 | p_err("failed to load program"); |
817 | return -1; | 817 | return -1; |
818 | } | 818 | } |
819 | 819 | ||
820 | if (do_pin_fd(prog_fd, argv[1])) { | 820 | if (do_pin_fd(prog_fd, argv[1])) { |
821 | p_err("failed to pin program\n"); | 821 | p_err("failed to pin program"); |
822 | return -1; | 822 | return -1; |
823 | } | 823 | } |
824 | 824 | ||