From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbdBJHuH (ORCPT ); Fri, 10 Feb 2017 02:50:07 -0500 Received: from terminus.zytor.com ([65.50.211.136]:51060 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369AbdBJHuG (ORCPT ); Fri, 10 Feb 2017 02:50:06 -0500 Date: Thu, 9 Feb 2017 23:46:38 -0800 From: tip-bot for Taeung Song Message-ID: Cc: peterz@infradead.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, treeze.taeung@gmail.com, wangnan0@huawei.com, hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org Reply-To: tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org, peterz@infradead.org, wangnan0@huawei.com, treeze.taeung@gmail.com, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <1485952447-7013-4-git-send-email-treeze.taeung@gmail.com> References: <1485952447-7013-4-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Use zfree() instead of ad hoc equivalent Git-Commit-ID: 506fde11a35f39e1b44478339c41e94dfd278aa2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 506fde11a35f39e1b44478339c41e94dfd278aa2 Gitweb: http://git.kernel.org/tip/506fde11a35f39e1b44478339c41e94dfd278aa2 Author: Taeung Song AuthorDate: Wed, 1 Feb 2017 21:34:06 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 8 Feb 2017 09:41:11 -0300 perf tools: Use zfree() instead of ad hoc equivalent We have zfree(&ptr) for this very common pattern: free(ptr); ptr = NULL; So use it in a few more places. Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1485952447-7013-4-git-send-email-treeze.taeung@gmail.com [ rewrote commit log ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 1f1f77d..ab1ba22 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -254,8 +254,7 @@ struct tracepoint_path *tracepoint_name_to_path(const char *name) if (path->system == NULL || path->name == NULL) { zfree(&path->system); zfree(&path->name); - free(path); - path = NULL; + zfree(&path); } return path; @@ -1482,8 +1481,7 @@ static void perf_pmu__parse_cleanup(void) p = perf_pmu_events_list + i; free(p->symbol); } - free(perf_pmu_events_list); - perf_pmu_events_list = NULL; + zfree(&perf_pmu_events_list); perf_pmu_events_list_num = 0; } }