diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-11-21 12:58:47 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-11-21 12:58:47 +0000 |
| commit | 5cc74b2073ec27d79f178efb5107913c47f2cf0b (patch) | |
| tree | 421ae5169850069f41d00c8ea9bd26bd05094a08 /lib | |
| parent | 42eefa5ae8dee3359bc192d794f49c17078e6477 (diff) | |
Retire ibuf_add_buf, replaced by better named ibuf_add_ibuf
OK tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libutil/Symbols.map | 1 | ||||
| -rw-r--r-- | lib/libutil/imsg-buffer.c | 9 | ||||
| -rw-r--r-- | lib/libutil/imsg.c | 4 | ||||
| -rw-r--r-- | lib/libutil/imsg.h | 3 |
4 files changed, 4 insertions, 13 deletions
diff --git a/lib/libutil/Symbols.map b/lib/libutil/Symbols.map index aa583d3f9ef..04ff2b37168 100644 --- a/lib/libutil/Symbols.map +++ b/lib/libutil/Symbols.map @@ -18,7 +18,6 @@ getptmfd; getrawpartition; ibuf_add; - ibuf_add_buf; ibuf_add_ibuf; ibuf_add_h16; ibuf_add_h32; diff --git a/lib/libutil/imsg-buffer.c b/lib/libutil/imsg-buffer.c index 537e52d6f99..337a96260e8 100644 --- a/lib/libutil/imsg-buffer.c +++ b/lib/libutil/imsg-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg-buffer.c,v 1.23 2024/11/21 12:49:58 claudio Exp $ */ +/* $OpenBSD: imsg-buffer.c,v 1.24 2024/11/21 12:58:46 claudio Exp $ */ /* * Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org> @@ -136,13 +136,6 @@ ibuf_add_ibuf(struct ibuf *buf, const struct ibuf *from) return ibuf_add(buf, ibuf_data(from), ibuf_size(from)); } -/* remove after tree is converted */ -int -ibuf_add_buf(struct ibuf *buf, const struct ibuf *from) -{ - return ibuf_add_ibuf(buf, from); -} - int ibuf_add_n8(struct ibuf *buf, uint64_t value) { diff --git a/lib/libutil/imsg.c b/lib/libutil/imsg.c index a0031c47778..063d4843a56 100644 --- a/lib/libutil/imsg.c +++ b/lib/libutil/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.32 2024/11/21 12:58:09 claudio Exp $ */ +/* $OpenBSD: imsg.c,v 1.33 2024/11/21 12:58:46 claudio Exp $ */ /* * Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org> @@ -374,7 +374,7 @@ imsg_forward(struct imsgbuf *imsgbuf, struct imsg *msg) return (-1); if (msg->buf != NULL) { - if (ibuf_add_buf(wbuf, msg->buf) == -1) { + if (ibuf_add_ibuf(wbuf, msg->buf) == -1) { ibuf_free(wbuf); return (-1); } diff --git a/lib/libutil/imsg.h b/lib/libutil/imsg.h index 56701b18c0c..ba8d3cc7d0a 100644 --- a/lib/libutil/imsg.h +++ b/lib/libutil/imsg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.h,v 1.14 2024/11/21 12:54:52 claudio Exp $ */ +/* $OpenBSD: imsg.h,v 1.15 2024/11/21 12:58:46 claudio Exp $ */ /* * Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org> @@ -81,7 +81,6 @@ struct iovec; struct ibuf *ibuf_open(size_t); struct ibuf *ibuf_dynamic(size_t, size_t); int ibuf_add(struct ibuf *, const void *, size_t); -int ibuf_add_buf(struct ibuf *, const struct ibuf *); int ibuf_add_ibuf(struct ibuf *, const struct ibuf *); int ibuf_add_zero(struct ibuf *, size_t); int ibuf_add_n8(struct ibuf *, uint64_t); |