perf: fix calloc argument ordering
PATCH 1/1 perf: fix calloc argument ordering
A sweep of the kernel for regex "kcalloc(sizeof" turned up 2 reversed args, fixed in commit d3d09e18203dba16a9dbdb2b4cc673d90748cdd1 ("EDAC:
Fix kcalloc argument order") and also fixed in the networking commit a1b1add07fa794974573d93483d68e373edfe7bd ("gro: Fix kcalloc argument order").
I know that was the regex used, because on seeing the 1st of these changes, I wondered "how many other instances of this are there" and I happened to just use "calloc(sizeof" as a regex and it in turn found these additional reversed args instances in the perf code.
In the kcalloc cases, the changes are cosmetic, since the numbers are simply multiplied. I had no desire to go data mining in userspace to see if the same thing held true there, however.
--- tools/perf/util/callchain.c | 2 +- tools/perf/util/header.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/callchain.c +1 -1
@@ -444,7 +444,7 @@ int callchain_cursor_append(struct callchain_cursor *cursor,struct callchain_cursor_node *node = *cursor->last;if (!node) { - node =calloc (sizeof (*node),1 ); + node =calloc (1 ,sizeof (*node));if (!node)return -ENOMEM ;
tools/perf/util/header.c +2 -2
@@ -2077,7 +2077,7 @@ static int perf_header__adds_write(struct perf_header *header,if (!nr_sections)return 0 ; - feat_sec = p =calloc (sizeof (*feat_sec), nr_sections); + feat_sec = p =calloc (nr_sections,sizeof (*feat_sec));if (feat_sec ==NULL )return -ENOMEM ;
@@ -2249,7 +2249,7 @@ int perf_header__process_sections(struct perf_header *header, int fd,if (!nr_sections)return 0 ; - feat_sec = sec =calloc (sizeof (*feat_sec), nr_sections); + feat_sec = sec =calloc (nr_sections,sizeof (*feat_sec));if (!feat_sec)return -1 ;
Signature · 1 line
1.8.1.2
[tip:perf/core] perf tools: Fix calloc argument ordering
Commit-ID: 91b988048bea24eae386da3141d247ccea795a81 Gitweb: http://git.kernel.org/tip/91b988048bea24eae386da3141d247ccea795a81 Author: Paul Gortmaker <[email protected]> AuthorDate: Wed, 30 Jan 2013 20:05:49 -0500 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2013 18:09:28 -0300
perf tools: Fix calloc argument ordering
A sweep of the kernel for regex "kcalloc(sizeof" turned up 2 reversed args, fixed in commit d3d09e18203dba16a9dbdb2b4cc673d90748cdd1 ("EDAC:
Fix kcalloc argument order") and also fixed in the networking commit a1b1add07fa794974573d93483d68e373edfe7bd ("gro: Fix kcalloc argument order").
I know that was the regex used, because on seeing the 1st of these changes, I wondered "how many other instances of this are there" and I happened to just use "calloc(sizeof" as a regex and it in turn found these additional reversed args instances in the perf code.
In the kcalloc cases, the changes are cosmetic, since the numbers are simply multiplied. I had no desire to go data mining in userspace to see if the same thing held true there, however.
--- tools/perf/util/callchain.c | 2 +- tools/perf/util/header.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/callchain.c +1 -1
@@ -444,7 +444,7 @@ int callchain_cursor_append(struct callchain_cursor *cursor,struct callchain_cursor_node *node = *cursor->last;if (!node) { - node =calloc (sizeof (*node),1 ); + node =calloc (1 ,sizeof (*node));if (!node)return -ENOMEM ;
tools/perf/util/header.c +2 -2
@@ -2253,7 +2253,7 @@ static int perf_header__adds_write(struct perf_header *header,if (!nr_sections)return 0 ; - feat_sec = p =calloc (sizeof (*feat_sec), nr_sections); + feat_sec = p =calloc (nr_sections,sizeof (*feat_sec));if (feat_sec ==NULL )return -ENOMEM ;
@@ -2425,7 +2425,7 @@ int perf_header__process_sections(struct perf_header *header, int fd,if (!nr_sections)return 0 ; - feat_sec = sec =calloc (sizeof (*feat_sec), nr_sections); + feat_sec = sec =calloc (nr_sections,sizeof (*feat_sec));if (!feat_sec)return -1 ;