Re: [PATCH v3 bpf-next 10/13] libbpf: fix formatting of bpf_object__append_subprog_code

Andrii Nakryiko
2025-09-19T23:19:02Z

On Thu, Sep 18, 2025 at 2:32 AM Anton Protopopov
<a.s.protopopov@gmail.com> wrote:
>
> The commit 6c918709bd30 ("libbpf: Refactor bpf_object__reloc_code")
> added the bpf_object__append_subprog_code() with incorrect indentations.
> Use tabs instead. (This also makes a consequent commit better readable.)
>
> Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
> ---
> tools/lib/bpf/libbpf.c | 52 +++++++++++++++++++++---------------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>

thanks!

Acked-by: Andrii Nakryiko <andrii@kernel.org>

> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index fe4fc5438678..2c1f48f77680 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -6393,32 +6393,32 @@ static int
> bpf_object__append_subprog_code(struct bpf_object *obj, struct bpf_program *main_prog,
> struct bpf_program *subprog)
> {
> - struct bpf_insn *insns;
> - size_t new_cnt;
> - int err;
> -
> - subprog->sub_insn_off = main_prog->insns_cnt;
> -
> - new_cnt = main_prog->insns_cnt + subprog->insns_cnt;
> - insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns));
> - if (!insns) {
> - pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name);
> - return -ENOMEM;
> - }
> - main_prog->insns = insns;
> - main_prog->insns_cnt = new_cnt;
> -
> - memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns,
> - subprog->insns_cnt * sizeof(*insns));
> -
> - pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
> - main_prog->name, subprog->insns_cnt, subprog->name);
> -
> - /* The subprog insns are now appended. Append its relos too. */
> - err = append_subprog_relos(main_prog, subprog);
> - if (err)
> - return err;
> - return 0;
> + struct bpf_insn *insns;
> + size_t new_cnt;
> + int err;
> +
> + subprog->sub_insn_off = main_prog->insns_cnt;
> +
> + new_cnt = main_prog->insns_cnt + subprog->insns_cnt;
> + insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns));
> + if (!insns) {
> + pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name);
> + return -ENOMEM;
> + }
> + main_prog->insns = insns;
> + main_prog->insns_cnt = new_cnt;
> +
> + memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns,
> + subprog->insns_cnt * sizeof(*insns));
> +
> + pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
> + main_prog->name, subprog->insns_cnt, subprog->name);
> +
> + /* The subprog insns are now appended. Append its relos too. */
> + err = append_subprog_relos(main_prog, subprog);
> + if (err)
> + return err;
> + return 0;
> }
>
> static int
> --
> 2.34.1
>