libbpf: Name changing for btf_get_from_id

iamkafai · Alexei Starovoitov · commit 1d2f44ca3424 · 2018-11-26T18:57:14.000-08:00
s/btf_get_from_id/btf__get_from_id/ to restore the API naming convention.

Signed-off-by: Martin KaFai Lau &lt;kafai@fb.com&gt;
Signed-off-by: Andrey Ignatov &lt;rdna@fb.com&gt;
Signed-off-by: Alexei Starovoitov &lt;ast@kernel.org&gt;
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
@@ -713,7 +713,7 @@ static int do_dump(int argc, char **argv)
 
 	prev_key = NULL;
 
-	err = btf_get_from_id(info.btf_id, &btf);
+	err = btf__get_from_id(info.btf_id, &btf);
 	if (err) {
 		p_err("failed to get btf");
 		goto exit_free;
@@ -857,7 +857,7 @@ static int do_lookup(int argc, char **argv)
 	}
 
 	/* here means bpf_map_lookup_elem() succeeded */
-	err = btf_get_from_id(info.btf_id, &btf);
+	err = btf__get_from_id(info.btf_id, &btf);
 	if (err) {
 		p_err("failed to get btf");
 		goto exit_free;
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
@@ -622,7 +622,7 @@ static int do_dump(int argc, char **argv)
 		goto err_free;
 	}
 
-	if (info.btf_id && btf_get_from_id(info.btf_id, &btf)) {
+	if (info.btf_id && btf__get_from_id(info.btf_id, &btf)) {
 		p_err("failed to get btf");
 		goto err_free;
 	}
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
@@ -415,7 +415,7 @@ const char *btf__name_by_offset(const struct btf *btf, __u32 offset)
 		return NULL;
 }
 
-int btf_get_from_id(__u32 id, struct btf **btf)
+int btf__get_from_id(__u32 id, struct btf **btf)
 {
 	struct bpf_btf_info btf_info = { 0 };
 	__u32 len = sizeof(btf_info);
diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h
@@ -73,7 +73,7 @@ LIBBPF_API __s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__fd(const struct btf *btf);
 LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
-LIBBPF_API int btf_get_from_id(__u32 id, struct btf **btf);
+LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);
 
 struct btf_ext *btf_ext__new(__u8 *data, __u32 size, btf_print_fn_t err_log);
 void btf_ext__free(struct btf_ext *btf_ext);
diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftests/bpf/test_btf.c
@@ -2585,7 +2585,7 @@ static int do_test_file(unsigned int test_num)
 		goto done;
 	}
 
-	err = btf_get_from_id(info.btf_id, &btf);
+	err = btf__get_from_id(info.btf_id, &btf);
 	if (CHECK(err, "cannot get btf from kernel, err: %d", err))
 		goto done;
 

Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ static int do_dump(int argc, char **argv)`
`622`	`622`	`goto err_free;`
`623`	`623`	`}`
`624`	`624`
`625`		`- if (info.btf_id && btf_get_from_id(info.btf_id, &btf)) {`
	`625`	`+ if (info.btf_id && btf__get_from_id(info.btf_id, &btf)) {`
`626`	`626`	`p_err("failed to get btf");`
`627`	`627`	`goto err_free;`
`628`	`628`	`}`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ const char btf__name_by_offset(const struct btf btf, __u32 offset)`
`415`	`415`	`return NULL;`
`416`	`416`	`}`
`417`	`417`
`418`		`-int btf_get_from_id(__u32 id, struct btf **btf)`
	`418`	`+int btf__get_from_id(__u32 id, struct btf **btf)`
`419`	`419`	`{`
`420`	`420`	`struct bpf_btf_info btf_info = { 0 };`
`421`	`421`	`__u32 len = sizeof(btf_info);`
Original file line number	Diff line number	Diff line change
`@@ -2585,7 +2585,7 @@ static int do_test_file(unsigned int test_num)`
`2585`	`2585`	`goto done;`
`2586`	`2586`	`}`
`2587`	`2587`
`2588`		`- err = btf_get_from_id(info.btf_id, &btf);`
	`2588`	`+ err = btf__get_from_id(info.btf_id, &btf);`
`2589`	`2589`	`if (CHECK(err, "cannot get btf from kernel, err: %d", err))`
`2590`	`2590`	`goto done;`
`2591`	`2591`