prefer sizeof(*ptr) to sizeof(struct) for malloc and free

5 files changed, 15 insertions, 16 deletions

diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 8b36d36ca36..9dad649fddc 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.104 2014/11/06 17:31:19 tedu Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.105 2014/11/14 23:26:48 tedu Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -739,7 +739,7 @@ ELFNAME2(exec,makecmds)(struct proc *p, struct exec_package *epp)
 	if (interp) {
 		struct elf_args *ap;
 
-		ap = malloc(sizeof(struct elf_args), M_TEMP, M_WAITOK);
+		ap = malloc(sizeof(*ap), M_TEMP, M_WAITOK);
 
 		ap->arg_phaddr = phdr;
 		ap->arg_phentsize = eh->e_phentsize;
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index db2783c53cb..4ea39a9f435 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_subr.c,v 1.38 2014/11/03 03:08:00 deraadt Exp $	*/
+/*	$OpenBSD: exec_subr.c,v 1.39 2014/11/14 23:26:48 tedu Exp $	*/
 /*	$NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $	*/
 
 /*
@@ -91,11 +91,11 @@ vmcmdset_extend(struct exec_vmcmd_set *evsp)
 	evsp->evs_cnt += ocnt;
 
 	/* reallocate the command set */
-	nvcp = mallocarray(evsp->evs_cnt, sizeof(struct exec_vmcmd), M_EXEC,
+	nvcp = mallocarray(evsp->evs_cnt, sizeof(*nvcp), M_EXEC,
 	    M_WAITOK);
-	bcopy(evsp->evs_cmds, nvcp, (ocnt * sizeof(struct exec_vmcmd)));
+	bcopy(evsp->evs_cmds, nvcp, (ocnt * sizeof(*nvcp)));
 	if (evsp->evs_cmds != evsp->evs_start)
-		free(evsp->evs_cmds, M_EXEC, ocnt * sizeof(struct exec_vmcmd));
+		free(evsp->evs_cmds, M_EXEC, ocnt * sizeof(*nvcp));
 	evsp->evs_cmds = nvcp;
 }
 
diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c
index 016d10761a6..ad7cf0e6934 100644
--- a/sys/kern/kern_sensors.c
+++ b/sys/kern/kern_sensors.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sensors.c,v 1.32 2014/11/08 13:36:51 jasper Exp $	*/
+/*	$OpenBSD: kern_sensors.c,v 1.33 2014/11/14 23:26:48 tedu Exp $	*/
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -196,7 +196,7 @@ sensor_task_register(void *arg, void (*func)(void *), unsigned int period)
 	    (sensors_taskq = taskq_create("sensors", 1, IPL_HIGH)) == NULL)
 		sensors_taskq = systq;
 
-	st = malloc(sizeof(struct sensor_task), M_DEVBUF, M_NOWAIT);
+	st = malloc(sizeof(*st), M_DEVBUF, M_NOWAIT);
 	if (st == NULL)
 		return (NULL);
 
@@ -247,7 +247,7 @@ sensor_task_work(void *xst, void *arg)
 	rw_exit_write(&st->lock);
 
 	if (period == 0)
-		free(st, M_DEVBUF, sizeof(struct sensor_task));
+		free(st, M_DEVBUF, sizeof(*st));
 	else 
 		timeout_add_sec(&st->timeout, period);
 }
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index c3ebe2a5b01..ccb43716fc4 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.220 2014/11/03 03:08:00 deraadt Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.221 2014/11/14 23:26:48 tedu Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -216,7 +216,7 @@ vfs_rootmountalloc(char *fstypename, char *devname, struct mount **mpp)
 			break;
 	if (vfsp == NULL)
 		return (ENODEV);
-	mp = malloc(sizeof(struct mount), M_MOUNT, M_WAITOK|M_ZERO);
+	mp = malloc(sizeof(*mp), M_MOUNT, M_WAITOK|M_ZERO);
 	(void)vfs_busy(mp, VB_READ|VB_NOWAIT);
 	LIST_INIT(&mp->mnt_vnodelist);
 	mp->mnt_vfc = vfsp;
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 645089956f2..bc02d4ef0e4 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.213 2014/11/03 21:28:35 tedu Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.214 2014/11/14 23:26:48 tedu Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -232,8 +232,7 @@ sys_mount(struct proc *p, void *v, register_t *retval)
 	/*
 	 * Allocate and initialize the file system.
 	 */
-	mp = (struct mount *)malloc((u_long)sizeof(struct mount),
-		M_MOUNT, M_WAITOK|M_ZERO);
+	mp = malloc(sizeof(*mp), M_MOUNT, M_WAITOK|M_ZERO);
 	(void) vfs_busy(mp, VB_READ|VB_NOWAIT);
 	mp->mnt_op = vfsp->vfc_vfsops;
 	mp->mnt_vfc = vfsp;
@@ -304,7 +303,7 @@ update:
 	} else {
 		mp->mnt_vnodecovered->v_mountedhere = NULL;
 		vfs_unbusy(mp);
-		free(mp, M_MOUNT, sizeof(struct mount));
+		free(mp, M_MOUNT, sizeof(*mp));
 		vput(vp);
 	}
 	return (error);
@@ -454,7 +453,7 @@ dounmount(struct mount *mp, int flags, struct proc *p, struct vnode *olddp)
 		panic("unmount: dangling vnode");
 
 	vfs_unbusy(mp);
-	free(mp, M_MOUNT, sizeof(struct mount));
+	free(mp, M_MOUNT, sizeof(*mp));
 
 	return (0);
 }