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 /usr.sbin/rad | |
| parent | caba869c8447fc7ef9f32581e1d02262e51ec18a (diff) | |
Use imsgbuf_clear() where appropriate instead of msgbuf_clear().
OK tb@
Diffstat (limited to 'usr.sbin/rad')
| -rw-r--r-- | usr.sbin/rad/control.c | 4 | ||||
| -rw-r--r-- | usr.sbin/rad/engine.c | 6 | ||||
| -rw-r--r-- | usr.sbin/rad/frontend.c | 6 | ||||
| -rw-r--r-- | usr.sbin/rad/rad.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/rad/control.c b/usr.sbin/rad/control.c index fa84bdd0aef..e491dbcb407 100644 --- a/usr.sbin/rad/control.c +++ b/usr.sbin/rad/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.11 2024/11/21 13:17:02 claudio Exp $ */ +/* $OpenBSD: control.c,v 1.12 2024/11/21 13:17:58 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -201,7 +201,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/usr.sbin/rad/engine.c b/usr.sbin/rad/engine.c index b8af4004541..b5fbe02226b 100644 --- a/usr.sbin/rad/engine.c +++ b/usr.sbin/rad/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.25 2024/11/21 13:17:02 claudio Exp $ */ +/* $OpenBSD: engine.c,v 1.26 2024/11/21 13:17:58 claudio Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -159,9 +159,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); config_clear(engine_conf); diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c index 3536cf8baa0..9e177a5cb67 100644 --- a/usr.sbin/rad/frontend.c +++ b/usr.sbin/rad/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.52 2024/11/21 13:17:02 claudio Exp $ */ +/* $OpenBSD: frontend.c,v 1.53 2024/11/21 13:17:58 claudio Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -274,10 +274,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); config_clear(frontend_conf); diff --git a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c index b4d39b08896..81bf1a3ef85 100644 --- a/usr.sbin/rad/rad.c +++ b/usr.sbin/rad/rad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rad.c,v 1.34 2024/11/21 13:17:02 claudio Exp $ */ +/* $OpenBSD: rad.c,v 1.35 2024/11/21 13:17:58 claudio Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -298,9 +298,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); config_clear(main_conf); |