Commit d459b59e authored Apr 17, 2019 by Prashant Bhole Committed by Alexei Starovoitov Apr 16, 2019

tools/bpftool: re-organize newline printing for map listing



Let's move the final newline printing in show_map_close_plain() at
the end of the function because it looks correct and consistent with
prog.c. Also let's do related changes for the line which prints
pinned file name.

Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent f25377ee

tools/bpf/bpftool/map.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -597,15 +597,16 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info)
		}
		close(fd);

		printf("\n");
		if (!hash_empty(map_table.table)) {
		struct pinned_obj *obj;

		hash_for_each_possible(map_table.table, obj, hash, info->id) {
		if (obj->id == info->id)
		printf("\tpinned %s\n", obj->path);
		printf("\n\tpinned %s", obj->path);
		}
		}

		printf("\n");
		return 0;
		}

Admin message