diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2018-04-23 15:39:53 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2018-04-23 15:40:15 +0100 |
| commit | aebb17dc75f60edc1817d670f978b71d8f327228 (patch) | |
| tree | 735e060afaae0fec204f078aed53202d49db70f6 /compat | |
| parent | c48440fd40992bab1ead8ec5aeadba5ba073359e (diff) | |
Sync imsg from OpenBSD.
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/imsg-buffer.c | 14 | ||||
| -rw-r--r-- | compat/imsg.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/compat/imsg-buffer.c b/compat/imsg-buffer.c index a302fa27..814591f4 100644 --- a/compat/imsg-buffer.c +++ b/compat/imsg-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg-buffer.c,v 1.10 2017/04/11 09:57:19 reyk Exp $ */ +/* $OpenBSD: imsg-buffer.c,v 1.11 2017/12/14 09:27:44 kettenis Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -29,9 +29,9 @@ #include "compat.h" #include "imsg.h" -int ibuf_realloc(struct ibuf *, size_t); -void ibuf_enqueue(struct msgbuf *, struct ibuf *); -void ibuf_dequeue(struct msgbuf *, struct ibuf *); +static int ibuf_realloc(struct ibuf *, size_t); +static void ibuf_enqueue(struct msgbuf *, struct ibuf *); +static void ibuf_dequeue(struct msgbuf *, struct ibuf *); struct ibuf * ibuf_open(size_t len) @@ -67,7 +67,7 @@ ibuf_dynamic(size_t len, size_t max) return (buf); } -int +static int ibuf_realloc(struct ibuf *buf, size_t len) { u_char *b; @@ -289,14 +289,14 @@ again: return (1); } -void +static void ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf) { TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry); msgbuf->queued++; } -void +static void ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf) { TAILQ_REMOVE(&msgbuf->bufs, buf, entry); diff --git a/compat/imsg.c b/compat/imsg.c index 85f13370..54ac7e56 100644 --- a/compat/imsg.c +++ b/compat/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.15 2017/04/11 09:57:19 reyk Exp $ */ +/* $OpenBSD: imsg.c,v 1.16 2017/12/14 09:27:44 kettenis Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -30,7 +30,7 @@ int imsg_fd_overhead = 0; -int imsg_get_fd(struct imsgbuf *); +static int imsg_get_fd(struct imsgbuf *); void imsg_init(struct imsgbuf *ibuf, int fd) @@ -266,7 +266,7 @@ imsg_free(struct imsg *imsg) freezero(imsg->data, imsg->hdr.len - IMSG_HEADER_SIZE); } -int +static int imsg_get_fd(struct imsgbuf *ibuf) { int fd; |