Update imsg*.[ch] from OpenBSD, including bzero->memset.

This commit is contained in:
Nicholas Marriott
2015-07-12 19:46:58 +01:00
parent 8b8a007e8e
commit 235e0bd65a
4 changed files with 14 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: imsg-buffer.c,v 1.4 2014/06/30 00:25:17 deraadt Exp $ */
/* $OpenBSD: imsg-buffer.c,v 1.7 2015/07/12 18:40:49 nicm Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -74,7 +74,7 @@ ibuf_realloc(struct ibuf *buf, size_t len)
/* on static buffers max is eq size and so the following fails */
if (buf->wpos + len > buf->max) {
errno = ENOMEM;
errno = ERANGE;
return (-1);
}
@@ -149,7 +149,7 @@ ibuf_write(struct msgbuf *msgbuf)
unsigned int i = 0;
ssize_t n;
bzero(&iov, sizeof(iov));
memset(&iov, 0, sizeof(iov));
TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
if (i >= IOV_MAX)
break;
@@ -233,8 +233,9 @@ msgbuf_write(struct msgbuf *msgbuf)
char buf[CMSG_SPACE(sizeof(int))];
} cmsgbuf;
bzero(&iov, sizeof(iov));
bzero(&msg, sizeof(msg));
memset(&iov, 0, sizeof(iov));
memset(&msg, 0, sizeof(msg));
memset(&cmsgbuf, 0, sizeof(cmsgbuf));
TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
if (i >= IOV_MAX)
break;