Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Arjun Sreedharan and committed by
Arnaldo Carvalho de Melo
e4e458b4 2e77784b

+7 -7
+2 -2
scripts/kconfig/mconf.c
··· 330 330 list_for_each_entry(sp, &trail, entries) { 331 331 if (sp->text) { 332 332 if (pos) { 333 - pos->next = xcalloc(sizeof(*pos), 1); 333 + pos->next = xcalloc(1, sizeof(*pos)); 334 334 pos = pos->next; 335 335 } else { 336 - subtitles = pos = xcalloc(sizeof(*pos), 1); 336 + subtitles = pos = xcalloc(1, sizeof(*pos)); 337 337 } 338 338 pos->text = sp->text; 339 339 }
+2 -2
tools/perf/ui/hist.c
··· 162 162 return ret; 163 163 164 164 nr_members = evsel->nr_members; 165 - fields_a = calloc(sizeof(*fields_a), nr_members); 166 - fields_b = calloc(sizeof(*fields_b), nr_members); 165 + fields_a = calloc(nr_members, sizeof(*fields_a)); 166 + fields_b = calloc(nr_members, sizeof(*fields_b)); 167 167 168 168 if (!fields_a || !fields_b) 169 169 goto out;
+3 -3
tools/thermal/tmon/sysfs.c
··· 446 446 return -1; 447 447 } 448 448 449 - ptdata.tzi = calloc(sizeof(struct tz_info), ptdata.max_tz_instance+1); 449 + ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct tz_info)); 450 450 if (!ptdata.tzi) { 451 451 fprintf(stderr, "Err: allocate tz_info\n"); 452 452 return -1; ··· 454 454 455 455 /* we still show thermal zone information if there is no cdev */ 456 456 if (ptdata.nr_cooling_dev) { 457 - ptdata.cdi = calloc(sizeof(struct cdev_info), 458 - ptdata.max_cdev_instance + 1); 457 + ptdata.cdi = calloc(ptdata.max_cdev_instance + 1, 458 + sizeof(struct cdev_info)); 459 459 if (!ptdata.cdi) { 460 460 free(ptdata.tzi); 461 461 fprintf(stderr, "Err: allocate cdev_info\n");