2019-05-30 09:39:53

by Leo Yan

Subject: [PATCH] perf symbols: Remove unused variable 'err'

Variable 'err' is defined but never used in function symsrc__init(),
remove it and directly return -1 at the end of the function.

Signed-off-by: Leo Yan <[email protected]>
---
tools/perf/util/symbol-elf.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 4ad106a5f2c0..fdc5bd7dbb90 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -699,7 +699,6 @@ bool __weak elf__needs_adjust_symbols(GElf_Ehdr ehdr)
int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
enum dso_binary_type type)
{
- int err = -1;
GElf_Ehdr ehdr;
Elf *elf;
int fd;
@@ -793,7 +792,7 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
elf_end(elf);
out_close:
close(fd);
- return err;
+ return -1;
}

/**
--
2.17.1

2019-05-30 12:44:56

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf symbols: Remove unused variable 'err'

Em Thu, May 30, 2019 at 05:38:01PM +0800, Leo Yan escreveu:
> Variable 'err' is defined but never used in function symsrc__init(),
> remove it and directly return -1 at the end of the function.

Thanks, applied.

- Arnaldo

> Signed-off-by: Leo Yan <[email protected]>
> ---
> tools/perf/util/symbol-elf.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
> index 4ad106a5f2c0..fdc5bd7dbb90 100644
> --- a/tools/perf/util/symbol-elf.c
> +++ b/tools/perf/util/symbol-elf.c
> @@ -699,7 +699,6 @@ bool __weak elf__needs_adjust_symbols(GElf_Ehdr ehdr)
> int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
> enum dso_binary_type type)
> {
> - int err = -1;
> GElf_Ehdr ehdr;
> Elf *elf;
> int fd;
> @@ -793,7 +792,7 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
> elf_end(elf);
> out_close:
> close(fd);
> - return err;
> + return -1;
> }
>
> /**
> --
> 2.17.1

--

- Arnaldo

2019-05-30 13:01:06

by Leo Yan

Subject: Re: [PATCH] perf symbols: Remove unused variable 'err'

On Thu, May 30, 2019 at 09:43:02AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Thu, May 30, 2019 at 05:38:01PM +0800, Leo Yan escreveu:
> > Variable 'err' is defined but never used in function symsrc__init(),
> > remove it and directly return -1 at the end of the function.
>
> Thanks, applied.

Thanks, Arnaldo.

2019-06-17 18:58:46

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf symbols: Remove unused variable 'err'

Commit-ID: e5f177a578edf4501d0758bfa922cd0b0f9d0e9d
Gitweb: https://git.kernel.org/tip/e5f177a578edf4501d0758bfa922cd0b0f9d0e9d
Author: Leo Yan <[email protected]>
AuthorDate: Thu, 30 May 2019 17:38:01 +0800
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 5 Jun 2019 09:47:54 -0300

perf symbols: Remove unused variable 'err'

Variable 'err' is defined but never used in function symsrc__init(),
remove it and directly return -1 at the end of the function.

Signed-off-by: Leo Yan <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/symbol-elf.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 4ad106a5f2c0..fdc5bd7dbb90 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -699,7 +699,6 @@ bool __weak elf__needs_adjust_symbols(GElf_Ehdr ehdr)
int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
enum dso_binary_type type)
{
- int err = -1;
GElf_Ehdr ehdr;
Elf *elf;
int fd;
@@ -793,7 +792,7 @@ out_elf_end:
elf_end(elf);
out_close:
close(fd);
- return err;
+ return -1;
}

/**