svn commit: r334603 - stable/11/usr.sbin/camdd

[Xin LI]

Author: delphij
Date: Mon Jun  4 05:23:06 2018
New Revision: 334603
URL: https://svnweb.freebsd.org/changeset/base/334603

Log:
  MFC r332905:
  
  Use calloc() instead of malloc+bzero.
  
  Reviewed by:	ken, emaste

Modified:
  stable/11/usr.sbin/camdd/camdd.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/camdd/camdd.c
==============================================================================
--- stable/11/usr.sbin/camdd/camdd.c	Mon Jun  4 05:04:40 2018	(r334602)
+++ stable/11/usr.sbin/camdd/camdd.c	Mon Jun  4 05:23:06 2018	(r334603)
@@ -591,14 +591,12 @@ camdd_alloc_dev(camdd_dev_type dev_type, struct kevent
 	size_t ke_size;
 	int retval = 0;
 
-	dev = malloc(sizeof(*dev));
+	dev = calloc(1, sizeof(*dev));
 	if (dev == NULL) {
 		warn("%s: unable to malloc %zu bytes", __func__, sizeof(*dev));
 		goto bailout;
 	}
 
-	bzero(dev, sizeof(*dev));
-
 	dev->dev_type = dev_type;
 	dev->io_timeout = timeout;
 	dev->retry_count = retry_count;
@@ -631,12 +629,11 @@ camdd_alloc_dev(camdd_dev_type dev_type, struct kevent
 	}
 
 	ke_size = sizeof(struct kevent) * (num_ke + 4);
-	ke = malloc(ke_size);
+	ke = calloc(1, ke_size);
 	if (ke == NULL) {
 		warn("%s: unable to malloc %zu bytes", __func__, ke_size);
 		goto bailout;
 	}
-	bzero(ke, ke_size);
 	if (num_ke > 0)
 		bcopy(new_ke, ke, num_ke * sizeof(struct kevent));
 
@@ -683,13 +680,12 @@ camdd_alloc_buf(struct camdd_dev *dev, camdd_buf_type 
 		break;
 	}
 	
-	buf = malloc(sizeof(*buf));
+	buf = calloc(1, sizeof(*buf));
 	if (buf == NULL) {
 		warn("unable to allocate %zu bytes", sizeof(*buf));
 		goto bailout_error;
 	}
 
-	bzero(buf, sizeof(*buf));
 	buf->buf_type = buf_type;
 	buf->dev = dev;
 	switch (buf_type) {