d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use calloc() instead of malloc+bzero.

Browse Source 
Reviewed by:	ken, emaste
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D15166
This commit is contained in:
delphij 2018-04-24 04:07:51 +00:00
parent 40146ecc1d
commit 539b4511d8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/camdd/camdd.c
View File

@ -596,14 +596,12 @@ camdd_alloc_dev(camdd_dev_type dev_type, struct kevent *new_ke, int num_ke,
size_t ke_size; size_t ke_size;
int retval = 0; int retval = 0;
dev = malloc(sizeof(*dev)); dev = calloc(1, sizeof(*dev));
if (dev == NULL) { if (dev == NULL) {
warn("%s: unable to malloc %zu bytes", __func__, sizeof(*dev)); warn("%s: unable to malloc %zu bytes", __func__, sizeof(*dev));
goto bailout; goto bailout;
} }
bzero(dev, sizeof(*dev));
dev->dev_type = dev_type; dev->dev_type = dev_type;
dev->io_timeout = timeout; dev->io_timeout = timeout;
dev->retry_count = retry_count; dev->retry_count = retry_count;
@ -636,12 +634,11 @@ camdd_alloc_dev(camdd_dev_type dev_type, struct kevent *new_ke, int num_ke,
} }
ke_size = sizeof(struct kevent) * (num_ke + 4); ke_size = sizeof(struct kevent) * (num_ke + 4);
ke = malloc(ke_size); ke = calloc(1, ke_size);
if (ke == NULL) { if (ke == NULL) {
warn("%s: unable to malloc %zu bytes", __func__, ke_size); warn("%s: unable to malloc %zu bytes", __func__, ke_size);
goto bailout; goto bailout;
} }
bzero(ke, ke_size);
if (num_ke > 0) if (num_ke > 0)
bcopy(new_ke, ke, num_ke * sizeof(struct kevent)); bcopy(new_ke, ke, num_ke * sizeof(struct kevent));
@ -688,13 +685,12 @@ camdd_alloc_buf(struct camdd_dev *dev, camdd_buf_type buf_type)
break; break;
} }
buf = malloc(sizeof(*buf)); buf = calloc(1, sizeof(*buf));
if (buf == NULL) { if (buf == NULL) {
warn("unable to allocate %zu bytes", sizeof(*buf)); warn("unable to allocate %zu bytes", sizeof(*buf));
goto bailout_error; goto bailout_error;
} }
bzero(buf, sizeof(*buf));
buf->buf_type = buf_type; buf->buf_type = buf_type;
buf->dev = dev; buf->dev = dev;
switch (buf_type) { switch (buf_type) {