tools, bpftool: Fix variable shadowing in emit_obj_refs_json()
authorQuentin Monnet <quentin@isovalent.com>
Tue, 23 Jun 2020 21:36:00 +0000 (22:36 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 24 Jun 2020 13:46:28 +0000 (15:46 +0200)
commit54b66c2255fadc8d78e88b5ffd99b19f7f754f5a
treecee4ef5c4efadc013a4fae8e1c981f4034c92960
parent4e608675e790b3f61b98bc38b3e8a38613b480ab
tools, bpftool: Fix variable shadowing in emit_obj_refs_json()

Building bpftool yields the following complaint:

    pids.c: In function 'emit_obj_refs_json':
    pids.c:175:80: warning: declaration of 'json_wtr' shadows a global declaration [-Wshadow]
      175 | void emit_obj_refs_json(struct obj_refs_table *table, __u32 id, json_writer_t *json_wtr)
          |                                                                 ~~~~~~~~~~~~~~~^~~~~~~~
    In file included from pids.c:11:
    main.h:141:23: note: shadowed declaration is here
      141 | extern json_writer_t *json_wtr;
          |                       ^~~~~~~~

Let's rename the variable.

v2:
- Rename the variable instead of calling the global json_wtr directly.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200623213600.16643-1-quentin@isovalent.com
tools/bpf/bpftool/pids.c