瀏覽代碼

tools: bpftool: preserve JSON output on errors on batch file parsing

Before this patch, perror() function is used in some cases when bpftool
fails to parse its input file in batch mode. This function does not
integrate well with the rest of the output when JSON is used, so we
replace it by something that is compliant.

Most calls to perror() had already been replaced in a previous patch,
this one is a leftover.

Fixes: d319c8e101c5 ("tools: bpftool: preserve JSON output on errors on batch file parsing")
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>
Quentin Monnet 7 年之前
父節點
當前提交
9be6d411b0
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      tools/bpf/bpftool/main.c

+ 1 - 1
tools/bpf/bpftool/main.c

@@ -244,7 +244,7 @@ static int do_batch(int argc, char **argv)
 	}
 	}
 
 
 	if (errno && errno != ENOENT) {
 	if (errno && errno != ENOENT) {
-		perror("reading batch file failed");
+		p_err("reading batch file failed: %s", strerror(errno));
 		err = -1;
 		err = -1;
 	} else {
 	} else {
 		p_info("processed %d lines", lines);
 		p_info("processed %d lines", lines);