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/slaacd | |
| parent | caba869c8447fc7ef9f32581e1d02262e51ec18a (diff) | |
Use imsgbuf_clear() where appropriate instead of msgbuf_clear().
OK tb@
Diffstat (limited to 'sbin/slaacd')
| -rw-r--r-- | sbin/slaacd/control.c | 4 | ||||
| -rw-r--r-- | sbin/slaacd/engine.c | 6 | ||||
| -rw-r--r-- | sbin/slaacd/frontend.c | 6 | ||||
| -rw-r--r-- | sbin/slaacd/slaacd.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sbin/slaacd/control.c b/sbin/slaacd/control.c index 6fbb2822350..113af0a8e68 100644 --- a/sbin/slaacd/control.c +++ b/sbin/slaacd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.14 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: control.c,v 1.15 2024/11/21 13:17:56 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -203,7 +203,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/slaacd/engine.c b/sbin/slaacd/engine.c index fc06a319e1d..52e92f7279a 100644 --- a/sbin/slaacd/engine.c +++ b/sbin/slaacd/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.96 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: engine.c,v 1.97 2024/11/21 13:17:57 claudio Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -416,9 +416,9 @@ __dead void engine_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); free(iev_frontend); diff --git a/sbin/slaacd/frontend.c b/sbin/slaacd/frontend.c index 02f2dfbbfe0..2b0bcc18d6e 100644 --- a/sbin/slaacd/frontend.c +++ b/sbin/slaacd/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.71 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: frontend.c,v 1.72 2024/11/21 13:17:57 claudio Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -246,10 +246,10 @@ frontend_shutdown(void) { /* Close pipes. */ imsgbuf_write(&iev_engine->ibuf); - msgbuf_clear(&iev_engine->ibuf.w); + imsgbuf_clear(&iev_engine->ibuf); close(iev_engine->ibuf.fd); imsgbuf_write(&iev_main->ibuf); - msgbuf_clear(&iev_main->ibuf.w); + imsgbuf_clear(&iev_main->ibuf); close(iev_main->ibuf.fd); free(iev_engine); diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c index 71e43759814..d881f4bdc9d 100644 --- a/sbin/slaacd/slaacd.c +++ b/sbin/slaacd/slaacd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.c,v 1.75 2024/11/21 13:17:01 claudio Exp $ */ +/* $OpenBSD: slaacd.c,v 1.76 2024/11/21 13:17:57 claudio Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -303,9 +303,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_engine->ibuf.w); + imsgbuf_clear(&iev_engine->ibuf); close(iev_engine->ibuf.fd); log_debug("waiting for children to terminate"); |