From: SF Markus Elfring <elfring@users.sourceforge.net> To: Adrian Hunter <adrian.hunter@intel.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, He Kuang <hekuang@huawei.com>, Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, Milian Wolff <milian.wolff@kdab.com>, Peter Zijlstra <peterz@infradead.org>, Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>, Wang Nan <wangnan0@huawei.com> Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org Subject: [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() Date: Mon, 23 Jan 2017 16:26:24 +0100 [thread overview] Message-ID: <2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net> (raw) In-Reply-To: <c8eebdee-ad45-c2a8-9a4d-e1032ec9a17f@users.sourceforge.net> From: Markus Elfring <elfring@users.sourceforge.net> Date: Mon, 23 Jan 2017 15:56:31 +0100 A local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- tools/perf/util/strlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c index 0d3dfcb919b4..a934be385a6d 100644 --- a/tools/perf/util/strlist.c +++ b/tools/perf/util/strlist.c @@ -118,9 +118,10 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s, return strlist__load(slist, s + 7); if (subst_dir) { - err = -ENOMEM; - if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) + if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) { + err = -ENOMEM; goto out; + } if (access(subst, F_OK) == 0) { err = strlist__load(slist, subst); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: SF Markus Elfring <elfring@users.sourceforge.net> To: Adrian Hunter <adrian.hunter@intel.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, He Kuang <hekuang@huawei.com>, Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, Milian Wolff <milian.wolff@kdab.com>, Peter Zijlstra <peterz@infradead.org>, Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>, Wang Nan <wangnan0@huawei.com> Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org Subject: [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() Date: Mon, 23 Jan 2017 15:26:24 +0000 [thread overview] Message-ID: <2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net> (raw) In-Reply-To: <c8eebdee-ad45-c2a8-9a4d-e1032ec9a17f@users.sourceforge.net> From: Markus Elfring <elfring@users.sourceforge.net> Date: Mon, 23 Jan 2017 15:56:31 +0100 A local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- tools/perf/util/strlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c index 0d3dfcb919b4..a934be385a6d 100644 --- a/tools/perf/util/strlist.c +++ b/tools/perf/util/strlist.c @@ -118,9 +118,10 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s, return strlist__load(slist, s + 7); if (subst_dir) { - err = -ENOMEM; - if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) + if (asprintf(&subst, "%s/%s", subst_dir, s) < 0) { + err = -ENOMEM; goto out; + } if (access(subst, F_OK) = 0) { err = strlist__load(slist, subst); -- 2.11.0
next prev parent reply other threads:[~2017-01-23 15:27 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-23 15:20 [PATCH 0/4] perf: Fine-tuning for three function implementations SF Markus Elfring 2017-01-23 15:20 ` SF Markus Elfring 2017-01-23 15:22 ` [PATCH 1/4] perf probe: Delete an unnecessary check in try_to_find_absolute_address() SF Markus Elfring 2017-01-23 15:22 ` SF Markus Elfring 2017-01-23 22:48 ` Masami Hiramatsu 2017-01-23 22:48 ` Masami Hiramatsu 2017-01-26 15:28 ` [tip:perf/core] " tip-bot for Markus Elfring 2017-01-23 15:24 ` [PATCH 2/4] perf probe: Delete an unnecessary assignment " SF Markus Elfring 2017-01-23 15:24 ` SF Markus Elfring 2017-01-23 22:47 ` Masami Hiramatsu 2017-01-23 22:47 ` Masami Hiramatsu 2017-01-26 15:29 ` [tip:perf/core] " tip-bot for Markus Elfring 2017-01-23 15:25 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() SF Markus Elfring 2017-01-23 15:25 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers( SF Markus Elfring 2017-01-23 22:56 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() Masami Hiramatsu 2017-01-23 22:56 ` [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handl Masami Hiramatsu 2017-01-23 15:26 ` SF Markus Elfring [this message] 2017-01-23 15:26 ` [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() SF Markus Elfring 2017-01-23 23:32 ` Masami Hiramatsu 2017-01-23 23:32 ` Masami Hiramatsu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net \ --to=elfring@users.sourceforge.net \ --cc=acme@kernel.org \ --cc=adrian.hunter@intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=hekuang@huawei.com \ --cc=jolsa@kernel.org \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mhiramat@kernel.org \ --cc=milian.wolff@kdab.com \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=ravi.bangoria@linux.vnet.ibm.com \ --cc=wangnan0@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.