From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751405AbdAWP0X (ORCPT ); Mon, 23 Jan 2017 10:26:23 -0500 Received: from mout.web.de ([217.72.192.78]:50154 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbdAWP0V (ORCPT ); Mon, 23 Jan 2017 10:26:21 -0500 Subject: [PATCH 3/4] perf session: Move an error code assignment in __perf_session__set_tracepoints_handlers() 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: Date: Mon, 23 Jan 2017 16:25:23 +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:Oo9DOW2YSCmApHcF0Z11DI9X1BKm3ln6lbe/O0CwuK86ON0XrNv qkOTsIw7+hZlZ+w383v4jqSjyGMzdYDRfkxJwGWZl02ZMEM4Oe/zj1B8hbGfkENDJ80lHSA NDdpOIexs33EfP+E4U4y9IWlbkyYwWV8KhhSShtHf1fcQTKGUZaJlxzdvh0VsAkbPcG+SCa +OqQuaAmP1sGHyU6YcPMA== X-UI-Out-Filterresults: notjunk:1;V01:K0:iACf2GCv3zE=:XbWmW6G/ymF1hv8H1ZUNZh lxyFom28K3yiTAbnLYOjfaHcUUOBm6qd+YisTmMfSfH+PdPpkzSImJWvbuyCd6TGs/vKaVIkB rMOnmI6n7SHuFD8cT4SDmRQE/DmmlaelSuUpqWFz5jvcgCU2CuNKDtTZSorx33EZ6a5R5lMte b8MhzMb0xpePqTk51a/oBR2xw663fhlqiu2bOUIbHEy5LGAvR3RIAPxv0DHcE9fPYdyz7bdjq 0pDo/QYabyWC2jafCttYnKgxRKksQ1zUx53J2JgbeX/ndbQTQtrYK2sek/JgPt8Ox0VVEJJcN lUojUpw+fkTd/TiNL6G4J4DE8TAT1+qL9sGKezFP7QTDwNLh0Ye6qJEQnnssNLAqqnAkZ8OqO KbmJQjpMKxIpN8vJeiea+gP1mgLwjCyhdX6G1LdvpQHWvafRLhCboNlkDuVbNj/tEs9XDAgdd Zkr0ytEh7yjAjfWmWZ1ETi7VUkcA0i/h7Svj8E0FxFEA2iUKrL2ohQ/xWxLUiqbOL+hGoMRid pdxjqJZRtlen8/MsDzMCqAaDPTqT50+WFB5ZuZO0wEtF5Jy9Q4mEkh5KJkbpnHECGMytGESAH s6cmkI07Os0II8/ZA/GtpUKIkjbTtSVgvs6Up0fL48QnqyWxb/1+RGogjv57Vj82AQqvO3W7u QTIAvun01jAZOlqrUKa12zGp/97vmUcl4EoIOdddeyPj126s0hvugumjyeVanlXBF0oK+qTFC Eummo/SpTyB6dqZzjDvAwRMLAVQPFy69qhtlJEBl9y9fRgYjpHeK0bIbKiW64hJwe3Hg4MI0H p44+WEA 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:43:13 +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/session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index f268201048a0..98605ad4affd 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2050,10 +2050,10 @@ int __perf_session__set_tracepoints_handlers(struct perf_session *session, evsel = perf_evlist__find_tracepoint_by_name(session->evlist, assocs[i].name); if (evsel == NULL) continue; - - err = -EEXIST; - if (evsel->handler != NULL) + if (evsel->handler) { + err = -EEXIST; goto out; + } evsel->handler = assocs[i].handler; } -- 2.11.0