tools/bpftool: re-organize newline printing for map listing
authorPrashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Wed, 17 Apr 2019 00:22:58 +0000 (09:22 +0900)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 17 Apr 2019 02:48:26 +0000 (19:48 -0700)
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>
tools/bpf/bpftool/map.c

index 44b192e877082a8cbebc32eed46441e1b8364b42..846d2e5c64b4b41ee8a78de448cb57d07ba1eb91 100644 (file)
@@ -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;
 }