Date: Sat, 2 Jun 2018 14:14:06 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Eitan Adler <eadler@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r334515 - head/usr.bin/top Message-ID: <20180602111406.GG3789@kib.kiev.ua> In-Reply-To: <201806020331.w523VEYs049095@repo.freebsd.org> References: <201806020331.w523VEYs049095@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jun 02, 2018 at 03:31:14AM +0000, Eitan Adler wrote: > Author: eadler > Date: Sat Jun 2 03:31:14 2018 > New Revision: 334515 > URL: https://svnweb.freebsd.org/changeset/base/334515 > > Log: > top(1): avoid casting malloc > > Modified: > head/usr.bin/top/display.c > head/usr.bin/top/machine.c > > Modified: head/usr.bin/top/display.c > ============================================================================== > --- head/usr.bin/top/display.c Sat Jun 2 03:25:15 2018 (r334514) > +++ head/usr.bin/top/display.c Sat Jun 2 03:31:14 2018 (r334515) > @@ -147,7 +147,7 @@ display_resize(void) > } > > /* now, allocate space for the screen buffer */ > - screenbuf = (char *)malloc(lines * display_width); > + screenbuf = malloc(lines * display_width); > if (screenbuf == (char *)NULL) > { > /* oops! */ > @@ -203,20 +203,20 @@ int display_init(struct statics * statics) > /* save pointers and allocate space for names */ > procstate_names = statics->procstate_names; > num_procstates = string_count(procstate_names); > - lprocstates = (int *)malloc(num_procstates * sizeof(int)); > + lprocstates = malloc(num_procstates * sizeof(int)); It seems that this and other changed mallocs() better be spelled as calloc(3). > > cpustate_names = statics->cpustate_names; > > swap_names = statics->swap_names; > num_swap = string_count(swap_names); > - lswap = (int *)malloc(num_swap * sizeof(int)); > + lswap = malloc(num_swap * sizeof(int)); > num_cpustates = string_count(cpustate_names); > - lcpustates = (int *)malloc(num_cpustates * sizeof(int) * statics->ncpus); > - cpustate_columns = (int *)malloc(num_cpustates * sizeof(int)); > + lcpustates = malloc(num_cpustates * sizeof(int) * statics->ncpus); > + cpustate_columns = malloc(num_cpustates * sizeof(int)); > > memory_names = statics->memory_names; > num_memory = string_count(memory_names); > - lmemory = (int *)malloc(num_memory * sizeof(int)); > + lmemory = malloc(num_memory * sizeof(int)); > > arc_names = statics->arc_names; > carc_names = statics->carc_names; > > Modified: head/usr.bin/top/machine.c > ============================================================================== > --- head/usr.bin/top/machine.c Sat Jun 2 03:25:15 2018 (r334514) > +++ head/usr.bin/top/machine.c Sat Jun 2 03:31:14 2018 (r334515) > @@ -990,7 +990,7 @@ format_next_process(caddr_t xhandle, char *(*get_useri > break; > } > > - cmdbuf = (char *)malloc(cmdlen + 1); > + cmdbuf = malloc(cmdlen + 1); > if (cmdbuf == NULL) { > warn("malloc(%d)", cmdlen + 1); > return NULL; > @@ -1025,7 +1025,7 @@ format_next_process(caddr_t xhandle, char *(*get_useri > size_t len; > > argbuflen = cmdlen * 4; > - argbuf = (char *)malloc(argbuflen + 1); > + argbuf = malloc(argbuflen + 1); > if (argbuf == NULL) { > warn("malloc(%zu)", argbuflen + 1); > free(cmdbuf);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180602111406.GG3789>