From: Quentin Monnet <quentin@isovalent.com>
Date: Tue, 23 Jun 2020 22:36:00 +0100
Subject: tools, bpftool: Fix variable shadowing in emit_obj_refs_json()
Patch-mainline: v5.9-rc1
Git-commit: 54b66c2255fadc8d78e88b5ffd99b19f7f754f5a
References: bsc#1177028
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
Acked-by: Gary Lin <glin@suse.com>
---
tools/bpf/bpftool/pids.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
--- a/tools/bpf/bpftool/pids.c
+++ b/tools/bpf/bpftool/pids.c
@@ -172,7 +172,8 @@ void delete_obj_refs_table(struct obj_re
}
}
-void emit_obj_refs_json(struct obj_refs_table *table, __u32 id, json_writer_t *json_wtr)
+void emit_obj_refs_json(struct obj_refs_table *table, __u32 id,
+ json_writer_t *json_writer)
{
struct obj_refs *refs;
struct obj_ref *ref;
@@ -187,16 +188,16 @@ void emit_obj_refs_json(struct obj_refs_
if (refs->ref_cnt == 0)
break;
- jsonw_name(json_wtr, "pids");
- jsonw_start_array(json_wtr);
+ jsonw_name(json_writer, "pids");
+ jsonw_start_array(json_writer);
for (i = 0; i < refs->ref_cnt; i++) {
ref = &refs->refs[i];
- jsonw_start_object(json_wtr);
- jsonw_int_field(json_wtr, "pid", ref->pid);
- jsonw_string_field(json_wtr, "comm", ref->comm);
- jsonw_end_object(json_wtr);
+ jsonw_start_object(json_writer);
+ jsonw_int_field(json_writer, "pid", ref->pid);
+ jsonw_string_field(json_writer, "comm", ref->comm);
+ jsonw_end_object(json_writer);
}
- jsonw_end_array(json_wtr);
+ jsonw_end_array(json_writer);
break;
}
}