[v2,bpf-next,7/9] libbpf: simplify two pieces of logic

Message ID	20190529173611.4012579-8-andriin@fb.com
State	Accepted
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> Smtp-Origin-Hostprefix: dev From: Andrii Nakryiko <andriin@fb.com> Smtp-Origin-Hostname: dev101.prn2.facebook.com To: <andrii.nakryiko@gmail.com>, <netdev@vger.kernel.org>, <bpf@vger.kernel.org>, <ast@fb.com>, <daniel@iogearbox.net>, <kernel-team@fb.com> CC: Andrii Nakryiko <andriin@fb.com> Smtp-Origin-Cluster: prn2c23 Subject: [PATCH v2 bpf-next 7/9] libbpf: simplify two pieces of logic Date: Wed, 29 May 2019 10:36:09 -0700 Message-ID: <20190529173611.4012579-8-andriin@fb.com> In-Reply-To: <20190529173611.4012579-1-andriin@fb.com> References: <20190529173611.4012579-1-andriin@fb.com> MIME-Version: 1.0 Content-Type: text/plain Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	libbpf random fixes \| expand [v2,bpf-next,0/9] libbpf random fixes [v2,bpf-next,1/9] libbpf: fix detection of corrupted BPF instructions section [v2,bpf-next,2/9] libbpf: preserve errno before calling into user callback [v2,bpf-next,3/9] libbpf: simplify endianness check [v2,bpf-next,4/9] libbpf: check map name retrieved from ELF [v2,bpf-next,5/9] libbpf: fix error code returned on corrupted ELF [v2,bpf-next,6/9] libbpf: use negative fd to specify missing BTF [v2,bpf-next,7/9] libbpf: simplify two pieces of logic [v2,bpf-next,8/9] libbpf: typo and formatting fixes [v2,bpf-next,9/9] libbpf: reduce unnecessary line wrapping

Message ID

20190529173611.4012579-8-andriin@fb.com

State

Accepted

Delegated to:

BPF Maintainers

Headers

Smtp-Origin-Hostprefix: dev
From: Andrii Nakryiko <andriin@fb.com>
Smtp-Origin-Hostname: dev101.prn2.facebook.com
To: <andrii.nakryiko@gmail.com>, <netdev@vger.kernel.org>,
	<bpf@vger.kernel.org>, <ast@fb.com>, <daniel@iogearbox.net>,
	<kernel-team@fb.com>
CC: Andrii Nakryiko <andriin@fb.com>
Smtp-Origin-Cluster: prn2c23
Subject: [PATCH v2 bpf-next 7/9] libbpf: simplify two pieces of logic
Date: Wed, 29 May 2019 10:36:09 -0700
Message-ID: <20190529173611.4012579-8-andriin@fb.com>
In-Reply-To: <20190529173611.4012579-1-andriin@fb.com>
References: <20190529173611.4012579-1-andriin@fb.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

libbpf random fixes | expand

Commit Message

Andrii Nakryiko May 29, 2019, 5:36 p.m. UTC

Extra check for type is unnecessary in first case.

Extra zeroing is unnecessary, as snprintf guarantees that it will
zero-terminate string.

Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
 tools/lib/bpf/libbpf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index a27a0351e595..5ea84ab69db1 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1430,8 +1430,7 @@  bpf_program__collect_reloc(struct bpf_program *prog, GElf_Shdr *shdr,
 				if (maps[map_idx].libbpf_type != type)
 					continue;
 				if (type != LIBBPF_MAP_UNSPEC ||
-				    (type == LIBBPF_MAP_UNSPEC &&
-				     maps[map_idx].offset == sym.st_value)) {
+				    maps[map_idx].offset == sym.st_value) {
 					pr_debug("relocation: find map %zd (%s) for insn %u\n",
 						 map_idx, maps[map_idx].name, insn_idx);
 					break;
@@ -2354,7 +2353,6 @@  struct bpf_object *bpf_object__open_buffer(void *obj_buf,
 		snprintf(tmp_name, sizeof(tmp_name), "%lx-%lx",
 			 (unsigned long)obj_buf,
 			 (unsigned long)obj_buf_sz);
-		tmp_name[sizeof(tmp_name) - 1] = '\0';
 		name = tmp_name;
 	}
 	pr_debug("loading object '%s' from buffer\n",

[v2,bpf-next,7/9] libbpf: simplify two pieces of logic

Commit Message

Patch