From owner-svn-src-head@freebsd.org Sat Jun 2 11:14:22 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 179E2F7A451; Sat, 2 Jun 2018 11:14:22 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FA067B7E5; Sat, 2 Jun 2018 11:14:21 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTP id w52BE6Pu017847; Sat, 2 Jun 2018 14:14:09 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua w52BE6Pu017847 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id w52BE6Ko017846; Sat, 2 Jun 2018 14:14:06 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 2 Jun 2018 14:14:06 +0300 From: Konstantin Belousov To: Eitan Adler 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> References: <201806020331.w523VEYs049095@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201806020331.w523VEYs049095@repo.freebsd.org> User-Agent: Mutt/1.10.0 (2018-05-17) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2018 11:14:22 -0000 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);