[PATCH bpf-next] tools: bpftool: add missing bpf_prog_linfo forward declaration

[PATCH bpf-next] tools: bpftool: add missing bpf_prog_linfo forward declaration

[Stanislav Fomichev]

When building bpftool without HAVE_LIBBFD_SUPPORT I see the following
warnings:
main.h:164:23: warning: ‘struct bpf_prog_linfo’ declared inside
parameter list will not be visible outside of this definition or
declaration
          const struct bpf_prog_linfo *prog_linfo,
                       ^~~~~~~~~~~~~~

Move bpf_prog_linfo around so both HAVE_LIBBFD_SUPPORT and
!HAVE_LIBBFD_SUPPORT see it.

Fixes: b053b439b72ad152 ("bpf: libbpf: bpftool: Print bpf_line_info
during prog dump")

Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
 tools/bpf/bpftool/main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
index d2beb88f0e2e..9487345b04a7 100644
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@ -147,8 +147,8 @@ int prog_parse_fd(int *argc, char ***argv);
 int map_parse_fd(int *argc, char ***argv);
 int map_parse_fd_and_info(int *argc, char ***argv, void *info, __u32 *info_len);
 
-#ifdef HAVE_LIBBFD_SUPPORT
 struct bpf_prog_linfo;
+#ifdef HAVE_LIBBFD_SUPPORT
 void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes,
 		       const char *arch, const char *disassembler_options,
 		       const struct btf *btf,
-- 
2.20.0.405.gbc1bbc6f85-goog

Re: [PATCH bpf-next] tools: bpftool: add missing bpf_prog_linfo forward declaration

[Stanislav Fomichev]

On Wed, Dec 19, 2018 at 2:51 PM Stanislav Fomichev <sdf@google.com> wrote:
>
> When building bpftool without HAVE_LIBBFD_SUPPORT I see the following
> warnings:
> main.h:164:23: warning: ‘struct bpf_prog_linfo’ declared inside
> parameter list will not be visible outside of this definition or
> declaration
>           const struct bpf_prog_linfo *prog_linfo,
>                        ^~~~~~~~~~~~~~
>
> Move bpf_prog_linfo around so both HAVE_LIBBFD_SUPPORT and
> !HAVE_LIBBFD_SUPPORT see it.
>
> Fixes: b053b439b72ad152 ("bpf: libbpf: bpftool: Print bpf_line_info
> during prog dump")
>
> Signed-off-by: Stanislav Fomichev <sdf@google.com>
> ---
>  tools/bpf/bpftool/main.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
> index d2beb88f0e2e..9487345b04a7 100644
> --- a/tools/bpf/bpftool/main.h
> +++ b/tools/bpf/bpftool/main.h
> @@ -147,8 +147,8 @@ int prog_parse_fd(int *argc, char ***argv);
>  int map_parse_fd(int *argc, char ***argv);
>  int map_parse_fd_and_info(int *argc, char ***argv, void *info, __u32 *info_len);
>
> -#ifdef HAVE_LIBBFD_SUPPORT
>  struct bpf_prog_linfo;
> +#ifdef HAVE_LIBBFD_SUPPORT
>  void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes,
>                        const char *arch, const char *disassembler_options,
>                        const struct btf *btf,
> --
> 2.20.0.405.gbc1bbc6f85-goog
>
Looks like its fixed already, please ignore!