]> git.itanic.dy.fi Git - linux-stable/commitdiff
perf symbols: Slightly simplify 'err' usage in dso__synthesize_plt_symbols()
authorAdrian Hunter <adrian.hunter@intel.com>
Fri, 20 Jan 2023 12:34:51 +0000 (14:34 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sun, 22 Jan 2023 21:10:18 +0000 (18:10 -0300)
Return zero directly instead of needless 'goto out_elf_end' that does
the same thing. That allows 'err' to be initialized to -1 instead of
having to change its value later.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20230120123456.12449-6-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/symbol-elf.c

index c6a4e6c73990f36ec78d307d886cd60ad1eb5288..990a2c6037bbba74b4718d63f25d612efa6b4bb9 100644 (file)
@@ -384,7 +384,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss)
        GElf_Ehdr ehdr;
        char sympltname[1024];
        Elf *elf;
-       int nr = 0, symidx, err = 0;
+       int nr = 0, symidx, err = -1;
 
        if (!ss->dynsym)
                return 0;
@@ -397,7 +397,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss)
        dynsym_idx = ss->dynsym_idx;
 
        if (scn_dynsym == NULL)
-               goto out_elf_end;
+               return 0;
 
        scn_plt_rel = elf_section_by_name(elf, &ehdr, &shdr_rel_plt,
                                          ".rela.plt", NULL);
@@ -405,11 +405,9 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss)
                scn_plt_rel = elf_section_by_name(elf, &ehdr, &shdr_rel_plt,
                                                  ".rel.plt", NULL);
                if (scn_plt_rel == NULL)
-                       goto out_elf_end;
+                       return 0;
        }
 
-       err = -1;
-
        if (shdr_rel_plt.sh_link != dynsym_idx)
                goto out_elf_end;