Commit 1d2f44ca authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov

libbpf: Name changing for btf_get_from_id

s/btf_get_from_id/btf__get_from_id/ to restore the API naming convention.
Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAndrey Ignatov <rdna@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent b89c2998
...@@ -713,7 +713,7 @@ static int do_dump(int argc, char **argv) ...@@ -713,7 +713,7 @@ static int do_dump(int argc, char **argv)
prev_key = NULL; prev_key = NULL;
err = btf_get_from_id(info.btf_id, &btf); err = btf__get_from_id(info.btf_id, &btf);
if (err) { if (err) {
p_err("failed to get btf"); p_err("failed to get btf");
goto exit_free; goto exit_free;
...@@ -857,7 +857,7 @@ static int do_lookup(int argc, char **argv) ...@@ -857,7 +857,7 @@ static int do_lookup(int argc, char **argv)
} }
/* here means bpf_map_lookup_elem() succeeded */ /* 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) { if (err) {
p_err("failed to get btf"); p_err("failed to get btf");
goto exit_free; goto exit_free;
......
...@@ -622,7 +622,7 @@ static int do_dump(int argc, char **argv) ...@@ -622,7 +622,7 @@ static int do_dump(int argc, char **argv)
goto err_free; 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"); p_err("failed to get btf");
goto err_free; goto err_free;
} }
......
...@@ -415,7 +415,7 @@ const char *btf__name_by_offset(const struct btf *btf, __u32 offset) ...@@ -415,7 +415,7 @@ const char *btf__name_by_offset(const struct btf *btf, __u32 offset)
return NULL; 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 }; struct bpf_btf_info btf_info = { 0 };
__u32 len = sizeof(btf_info); __u32 len = sizeof(btf_info);
......
...@@ -73,7 +73,7 @@ LIBBPF_API __s64 btf__resolve_size(const struct btf *btf, __u32 type_id); ...@@ -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__resolve_type(const struct btf *btf, __u32 type_id);
LIBBPF_API int btf__fd(const struct btf *btf); 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 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); 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); void btf_ext__free(struct btf_ext *btf_ext);
......
...@@ -2585,7 +2585,7 @@ static int do_test_file(unsigned int test_num) ...@@ -2585,7 +2585,7 @@ static int do_test_file(unsigned int test_num)
goto done; 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)) if (CHECK(err, "cannot get btf from kernel, err: %d", err))
goto done; goto done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment