svn commit: r332905 - head/usr.sbin/camdd
Xin LI
delphij at FreeBSD.org
Tue Apr 24 04:07:52 UTC 2018
Author: delphij
Date: Tue Apr 24 04:07:51 2018
New Revision: 332905
URL: https://svnweb.freebsd.org/changeset/base/332905
Log:
Use calloc() instead of malloc+bzero.
Reviewed by: ken, emaste
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D15166
Modified:
head/usr.sbin/camdd/camdd.c
Modified: head/usr.sbin/camdd/camdd.c
==============================================================================
--- head/usr.sbin/camdd/camdd.c Tue Apr 24 03:07:49 2018 (r332904)
+++ head/usr.sbin/camdd/camdd.c Tue Apr 24 04:07:51 2018 (r332905)
@@ -596,14 +596,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;
@@ -636,12 +634,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));
@@ -688,13 +685,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) {
More information about the svn-src-all
mailing list