From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396AbdAWP1N (ORCPT ); Mon, 23 Jan 2017 10:27:13 -0500 Received: from mout.web.de ([217.72.192.78]:59149 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbdAWP1L (ORCPT ); Mon, 23 Jan 2017 10:27:11 -0500 Subject: [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , He Kuang , Ingo Molnar , Jiri Olsa , Masami Hiramatsu , Milian Wolff , Peter Zijlstra , Ravi Bangoria , Wang Nan References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net> Date: Mon, 23 Jan 2017 16:26:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:fKIOnpzhAvld+sRUYAB8EouHyloVrndqMjE56IKmmLPNIKRhRj5 qt6JtAkI0Pp6L0GvaO63iQlgqTmEH/P/s2naVyUieDgIuKgAcYPtkNsUBI4squEnEV6VHHq kNQtRfXACNb63VZDJD8wC6DMYzOBngEIfbBx4NgMd+QNaeJ6H9UuF+1lg7R+Y/CpBVTzpkH QNw4e15jr03O5Y6DixtOg== X-UI-Out-Filterresults: notjunk:1;V01:K0:J8D0cLAHHiY=:4KEqRohFQuKBvCtQN8xxJN Rxl7wTA/R0Y9I5dP6o688bPeWGvIi7POhYEPw95LEI5vIXyjrbWBwVkPUjH2WxmQ9sGG4V0IO 63IxcFz97/WGmqJnf9zwn+pVmvAqpCZnHrt4Nnzdz0n0pm3yZVbVHv/Wp/KJ06lPiBCv4n5pd rj44zc0cITc/oy4QcUt7bbZVwM/xBgRql+lEsr/sy29Bxv7htpPPPZAepB3X+L0aMzdBtNxmW Ha6lKiwkRwipW9Y/X3y/rhCOziqOkgxSWIonOxWFUZSJ9VxenWhi9enM+t/0Z74HgfVBP210t ia/P7ieGMumLt6x1EBMRQV4+qdRJOmlaosVOhpevS2YavtlO0QxCRSQV8qjjPheaonvruwR2/ l81OfesudbV7lB2G8bbHuYN/ogOfuxjfREn1Jo6d5pX3smztj7ogwRPZMTfiXMw+1mku/AqUm i3+uW2tLDQq8WjHNUmPckMQm3k1tanAsxPKTgpuk3uwrRKhK5JpO5smHunoNvy3yZe8RwO/ti Nvnb/PgZMLSVHgm7v0bH577gthTWxfapy/Bl4Urfr8P1UEH/l3VwA4IPitkSohdhptuT5fqog FOGbD7MbFn+E9sXO7fhwHq6PiC/aSXFRqsv/LX3N7oY345KHD2rU0TMopcquUs12ZThNo9qRT mk8YFaucG14BA0TuAHzv+sXaV/QigC5JOFtQb47J4lGnCPOIDlgKmRsyiEZey+gt0l5qTgOmY +riyPrGIHlEbIHdY51mPR0SO4QhhvD7FKsjitEJN2Ym5/CQxyUpAdV2ZYuIAveIM5SrPXXf8z lekzbtW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Mon, 23 Jan 2017 15:26:24 +0000 Subject: [PATCH 4/4] perf strlist: Move an error code assignment in strlist__parse_list_entry() Message-Id: <2200b6ba-7284-285b-0fb7-60688f5871b3@users.sourceforge.net> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , He Kuang , Ingo Molnar , Jiri Olsa , Masami Hiramatsu , Milian Wolff , Peter Zijlstra , Ravi Bangoria , Wang Nan Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring 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 --- 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