[v3,bpf-next] tools/resolve_btfids: Fix warnings

Message ID 20210329223143.3659983-1-sdf@google.com
State New
Headers show
Series
  • [v3,bpf-next] tools/resolve_btfids: Fix warnings
Related show

Commit Message

Stanislav Fomichev March 29, 2021, 10:31 p.m.
* make eprintf static, used only in main.c
* initialize ret in eprintf
* remove unused *tmp

v3:
* remove another err (Song Liu)

v2:
* remove unused 'int err = -1'

Cc: Song Liu <song@kernel.org>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
 tools/bpf/resolve_btfids/main.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

Song Liu March 29, 2021, 11:10 p.m. | #1
On Mon, Mar 29, 2021 at 3:35 PM Stanislav Fomichev <sdf@google.com> wrote:
>
> * make eprintf static, used only in main.c
> * initialize ret in eprintf
> * remove unused *tmp
>
> v3:
> * remove another err (Song Liu)
>
> v2:
> * remove unused 'int err = -1'
>
> Cc: Song Liu <song@kernel.org>
> Signed-off-by: Stanislav Fomichev <sdf@google.com>

Acked-by: Song Liu <songliubraving@fb.com>
[...]
Andrii Nakryiko March 31, 2021, 8:28 p.m. | #2
On Mon, Mar 29, 2021 at 3:34 PM Stanislav Fomichev <sdf@google.com> wrote:
>

> * make eprintf static, used only in main.c

> * initialize ret in eprintf

> * remove unused *tmp

>

> v3:

> * remove another err (Song Liu)

>

> v2:

> * remove unused 'int err = -1'

>

> Cc: Song Liu <song@kernel.org>

> Signed-off-by: Stanislav Fomichev <sdf@google.com>

> ---


Just in case the bot skips this one. Applied to bpf-next.

[...]

Patch

diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
index 80d966cfcaa1..7550fd9c3188 100644
--- a/tools/bpf/resolve_btfids/main.c
+++ b/tools/bpf/resolve_btfids/main.c
@@ -115,10 +115,10 @@  struct object {
 
 static int verbose;
 
-int eprintf(int level, int var, const char *fmt, ...)
+static int eprintf(int level, int var, const char *fmt, ...)
 {
 	va_list args;
-	int ret;
+	int ret = 0;
 
 	if (var >= level) {
 		va_start(args, fmt);
@@ -385,7 +385,7 @@  static int elf_collect(struct object *obj)
 static int symbols_collect(struct object *obj)
 {
 	Elf_Scn *scn = NULL;
-	int n, i, err = 0;
+	int n, i;
 	GElf_Shdr sh;
 	char *name;
 
@@ -402,11 +402,10 @@  static int symbols_collect(struct object *obj)
 	 * Scan symbols and look for the ones starting with
 	 * __BTF_ID__* over .BTF_ids section.
 	 */
-	for (i = 0; !err && i < n; i++) {
-		char *tmp, *prefix;
+	for (i = 0; i < n; i++) {
+		char *prefix;
 		struct btf_id *id;
 		GElf_Sym sym;
-		int err = -1;
 
 		if (!gelf_getsym(obj->efile.symbols, i, &sym))
 			return -1;