diff options
author | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-11-21 13:17:59 +0000 |
---|---|---|
committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-11-21 13:17:59 +0000 |
commit | 4efad393769386dddf5775e5943647ffd6ef04e0 (patch) | |
tree | aff4368f8771b71684bbc5c079be47a6bea32b51 /sbin/unwind | |
parent | caba869c8447fc7ef9f32581e1d02262e51ec18a (diff) |
Use imsgbuf_clear() where appropriate instead of msgbuf_clear().
OK tb@
Diffstat (limited to 'sbin/unwind')
-rw-r--r-- | sbin/unwind/control.c | 4 | ||||
-rw-r--r-- | sbin/unwind/frontend.c | 6 | ||||
-rw-r--r-- | sbin/unwind/resolver.c | 6 | ||||
-rw-r--r-- | sbin/unwind/unwind.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sbin/unwind/control.c b/sbin/unwind/control.c index 1284783e49e..0b84aa5a99c 100644 --- a/sbin/unwind/control.c +++ b/sbin/unwind/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.20 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: control.c,v 1.21 2024/11/21 13:17:57 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -202,7 +202,7 @@ control_close(int fd) return; } - msgbuf_clear(&c->iev.ibuf.w); + imsgbuf_clear(&c->iev.ibuf); TAILQ_REMOVE(&ctl_conns, c, entry); event_del(&c->iev.ev); diff --git a/sbin/unwind/frontend.c b/sbin/unwind/frontend.c index 8373d112e4e..452c8762787 100644 --- a/sbin/unwind/frontend.c +++ b/sbin/unwind/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.86 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: frontend.c,v 1.87 2024/11/21 13:17:57 claudio Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -272,10 +272,10 @@ frontend_shutdown(void) { /* Close pipes. */ imsgbuf_write(&iev_resolver->ibuf); - msgbuf_clear(&iev_resolver->ibuf.w); + imsgbuf_clear(&iev_resolver->ibuf); close(iev_resolver->ibuf.fd); imsgbuf_write(&iev_main->ibuf); - msgbuf_clear(&iev_main->ibuf.w); + imsgbuf_clear(&iev_main->ibuf); close(iev_main->ibuf.fd); config_clear(frontend_conf); diff --git a/sbin/unwind/resolver.c b/sbin/unwind/resolver.c index 9485c28a8ba..c807921551e 100644 --- a/sbin/unwind/resolver.c +++ b/sbin/unwind/resolver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resolver.c,v 1.170 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: resolver.c,v 1.171 2024/11/21 13:17:57 claudio Exp $ */ /* @@ -453,9 +453,9 @@ __dead void resolver_shutdown(void) { /* Close pipes. */ - msgbuf_clear(&iev_frontend->ibuf.w); + imsgbuf_clear(&iev_frontend->ibuf); close(iev_frontend->ibuf.fd); - msgbuf_clear(&iev_main->ibuf.w); + imsgbuf_clear(&iev_main->ibuf); close(iev_main->ibuf.fd); config_clear(resolver_conf); diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c index 7cfe6a77d57..5f2091e961e 100644 --- a/sbin/unwind/unwind.c +++ b/sbin/unwind/unwind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unwind.c,v 1.71 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: unwind.c,v 1.72 2024/11/21 13:17:57 claudio Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -312,9 +312,9 @@ main_shutdown(void) int status; /* Close pipes. */ - msgbuf_clear(&iev_frontend->ibuf.w); + imsgbuf_clear(&iev_frontend->ibuf); close(iev_frontend->ibuf.fd); - msgbuf_clear(&iev_resolver->ibuf.w); + imsgbuf_clear(&iev_resolver->ibuf); close(iev_resolver->ibuf.fd); config_clear(main_conf); |