From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161809AbcE3Qoc (ORCPT ); Mon, 30 May 2016 12:44:32 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35750 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161697AbcE3Qo3 (ORCPT ); Mon, 30 May 2016 12:44:29 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Taeung Song , Jiri Olsa Subject: [PATCH v3 3/7] perf config: Modify perf_config_set__delete() using global variable 'config_set' Date: Tue, 31 May 2016 01:44:07 +0900 Message-Id: <1464626651-1523-4-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464626651-1523-1-git-send-email-treeze.taeung@gmail.com> References: <1464626651-1523-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function deleted allocated config set but the global variable 'config_set' is used all around so this directly remove 'config_set' instead of using local variable 'set'. Cc: Namhyung Kim Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Alexander Shishkin Signed-off-by: Taeung Song --- tools/perf/builtin-config.c | 2 +- tools/perf/util/config.c | 8 ++++---- tools/perf/util/config.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index b3bc01a..255015e 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -105,7 +105,7 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) usage_with_options(config_usage, config_options); } - perf_config_set__delete(config_set); + perf_config_set__delete(); out_err: return ret; } diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index adf2bad..68def9a 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -642,7 +642,7 @@ static int collect_config(const char *var, const char *value, out_free: free(key); - perf_config_set__delete(set); + perf_config_set__delete(); return -1; } @@ -740,10 +740,10 @@ static void perf_config_set__purge(struct perf_config_set *set) } } -void perf_config_set__delete(struct perf_config_set *set) +void perf_config_set__delete(void) { - perf_config_set__purge(set); - free(set); + perf_config_set__purge(config_set); + zfree(&config_set); } /* diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index ea157a4..e9b47b3 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -23,6 +23,6 @@ struct perf_config_set { extern struct perf_config_set *config_set; struct perf_config_set *perf_config_set__new(void); -void perf_config_set__delete(struct perf_config_set *set); +void perf_config_set__delete(void); #endif /* __PERF_CONFIG_H */ -- 2.5.0