mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
calloc/xcalloc: Fix argument order
The calloc() and xcalloc() functions takes @nmemb first and then @size. Fix all w/ pattern "calloc\s*(\s*sizeof". Signed-off-by: Arjun Sreedharan <arjun024@gmail.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Ingo Molnar <mingo@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1417866043-1877-1-git-send-email-arjun024@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
2e77784bb7
commit
e4e458b45c
|
@ -330,10 +330,10 @@ static void set_subtitle(void)
|
||||||
list_for_each_entry(sp, &trail, entries) {
|
list_for_each_entry(sp, &trail, entries) {
|
||||||
if (sp->text) {
|
if (sp->text) {
|
||||||
if (pos) {
|
if (pos) {
|
||||||
pos->next = xcalloc(sizeof(*pos), 1);
|
pos->next = xcalloc(1, sizeof(*pos));
|
||||||
pos = pos->next;
|
pos = pos->next;
|
||||||
} else {
|
} else {
|
||||||
subtitles = pos = xcalloc(sizeof(*pos), 1);
|
subtitles = pos = xcalloc(1, sizeof(*pos));
|
||||||
}
|
}
|
||||||
pos->text = sp->text;
|
pos->text = sp->text;
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,8 +162,8 @@ static int __hpp__sort(struct hist_entry *a, struct hist_entry *b,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
nr_members = evsel->nr_members;
|
nr_members = evsel->nr_members;
|
||||||
fields_a = calloc(sizeof(*fields_a), nr_members);
|
fields_a = calloc(nr_members, sizeof(*fields_a));
|
||||||
fields_b = calloc(sizeof(*fields_b), nr_members);
|
fields_b = calloc(nr_members, sizeof(*fields_b));
|
||||||
|
|
||||||
if (!fields_a || !fields_b)
|
if (!fields_a || !fields_b)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -446,7 +446,7 @@ int probe_thermal_sysfs(void)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ptdata.tzi = calloc(sizeof(struct tz_info), ptdata.max_tz_instance+1);
|
ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct tz_info));
|
||||||
if (!ptdata.tzi) {
|
if (!ptdata.tzi) {
|
||||||
fprintf(stderr, "Err: allocate tz_info\n");
|
fprintf(stderr, "Err: allocate tz_info\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -454,8 +454,8 @@ int probe_thermal_sysfs(void)
|
||||||
|
|
||||||
/* we still show thermal zone information if there is no cdev */
|
/* we still show thermal zone information if there is no cdev */
|
||||||
if (ptdata.nr_cooling_dev) {
|
if (ptdata.nr_cooling_dev) {
|
||||||
ptdata.cdi = calloc(sizeof(struct cdev_info),
|
ptdata.cdi = calloc(ptdata.max_cdev_instance + 1,
|
||||||
ptdata.max_cdev_instance + 1);
|
sizeof(struct cdev_info));
|
||||||
if (!ptdata.cdi) {
|
if (!ptdata.cdi) {
|
||||||
free(ptdata.tzi);
|
free(ptdata.tzi);
|
||||||
fprintf(stderr, "Err: allocate cdev_info\n");
|
fprintf(stderr, "Err: allocate cdev_info\n");
|
||||||
|
|
Loading…
Reference in a new issue