From owner-svn-src-all@freebsd.org Sat Jun 2 03:31:15 2018 Return-Path: Delivered-To: svn-src-all@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 28EF7FDEB9E; Sat, 2 Jun 2018 03:31:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CEB8B6806A; Sat, 2 Jun 2018 03:31:14 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B179A2025; Sat, 2 Jun 2018 03:31:14 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w523VEVN049096; Sat, 2 Jun 2018 03:31:14 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w523VEYs049095; Sat, 2 Jun 2018 03:31:14 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806020331.w523VEYs049095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 2 Jun 2018 03:31:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334515 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 334515 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2018 03:31:15 -0000 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)); 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);