Skip to content

Commit bf7f9d4

Browse files
theihorKernel Patches Daemon
authored andcommitted
resolve_btfids: rename object btf field to btf_path
Rename the member of `struct object` holding the path to BTF data if provided via --btf arg. `btf_path` is less ambiguous. Signed-off-by: Ihor Solodrai <[email protected]>
1 parent 8c83cb5 commit bf7f9d4

File tree

1 file changed

+4
-4
lines changed
  • tools/bpf/resolve_btfids

1 file changed

+4
-4
lines changed

tools/bpf/resolve_btfids/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ struct btf_id {
113113

114114
struct object {
115115
const char *path;
116-
const char *btf;
116+
const char *btf_path;
117117
const char *base_btf_path;
118118

119119
struct {
@@ -550,11 +550,11 @@ static int symbols_resolve(struct object *obj)
550550
}
551551
}
552552

553-
btf = btf__parse_split(obj->btf ?: obj->path, base_btf);
553+
btf = btf__parse_split(obj->btf_path ?: obj->path, base_btf);
554554
err = libbpf_get_error(btf);
555555
if (err) {
556556
pr_err("FAILED: load BTF from %s: %s\n",
557-
obj->btf ?: obj->path, strerror(-err));
557+
obj->btf_path ?: obj->path, strerror(-err));
558558
goto out;
559559
}
560560

@@ -790,7 +790,7 @@ int main(int argc, const char **argv)
790790
struct option btfid_options[] = {
791791
OPT_INCR('v', "verbose", &verbose,
792792
"be more verbose (show errors, etc)"),
793-
OPT_STRING(0, "btf", &obj.btf, "BTF data",
793+
OPT_STRING(0, "btf", &obj.btf_path, "BTF data",
794794
"BTF data"),
795795
OPT_STRING('b', "btf_base", &obj.base_btf_path, "file",
796796
"path of file providing base BTF"),

0 commit comments

Comments
 (0)