Update to FreeBSD head 2018-02-01

Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-20 15:53:03 +02:00
parent bb80d9df8b
commit 18fa92c2dc
356 changed files with 6598 additions and 3376 deletions

View File

@@ -78,7 +78,8 @@ buf_close(int sock, struct buf *buf)
ssize_t
buf_read(int sock, void *buf, size_t nbytes)
{
ssize_t n, r = 0;
ssize_t n;
size_t r = 0;
char *p = buf;
do {
@@ -86,7 +87,7 @@ buf_read(int sock, void *buf, size_t nbytes)
if (n == 0)
error("connection closed");
if (n != -1) {
r += n;
r += (size_t)n;
p += n;
nbytes -= n;
}
@@ -109,9 +110,9 @@ dispatch_imsg(struct interface_info *ifi, int fd)
char *medium, *reason, *filename,
*servername, *prefix;
size_t medium_len, reason_len, filename_len,
servername_len, prefix_len, totlen;
servername_len, optlen, prefix_len, totlen;
struct client_lease lease;
int ret, i, optlen;
int ret, i;
struct buf *buf;
u_int16_t mtu;