Commit Diff

Commit:
e7965818e16df6d5a47fdfeb7753c447c80677a9
From:
claudio <claudio@openbsd.org>
Date:
Message:
Introduce imsg_write() and use it instead of msgbuf_write(). imsg_write() is just a thin wrapper around msgbuf_write(). So this is mostly search and replace. OK tb@
Actions:
Patch | Tree
commit - 63ca1296237357eb9917f051f6b3fbfedeb68440
commit + e7965818e16df6d5a47fdfeb7753c447c80677a9
blob - 9a6a9b9b523bc43c7f3bf4f6495df012e8346247
blob + 62ee3f233848926a8339815fd7b77d6040821c55
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.15 2023/03/08 04:43:13 guenther Exp $	*/
+/*	$OpenBSD: control.c,v 1.16 2024/11/21 13:10:36 claudio Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -237,7 +237,7 @@ control_dispatch_imsg(int fd, short event, void *arg)
 	}
 
 	if (event & EV_WRITE) {
-		if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
+		if (imsg_write(&c->iev.ibuf) <= 0 && errno != EAGAIN) {
 			control_close(fd, cs);
 			return;
 		}
blob - 73dabf2670b11841ac21b96fc6506dd9e6f552b6
blob + 7bd184c784154ee1cdc85b0c0ded523f866e4652
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.46 2024/11/21 13:06:25 claudio Exp $	*/
+/*	$OpenBSD: proc.c,v 1.47 2024/11/21 13:10:36 claudio Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -611,8 +611,8 @@ proc_dispatch(int fd, short event, void *arg)
 	}
 
 	if (event & EV_WRITE) {
-		if ((n = msgbuf_write(&ibuf->w)) == -1 && errno != EAGAIN)
-			fatal("%s: msgbuf_write", __func__);
+		if ((n = imsg_write(ibuf)) == -1 && errno != EAGAIN)
+			fatal("%s: imsg_write", __func__);
 		if (n == 0) {
 			/* this pipe is dead, so remove the event handler */
 			event_del(&iev->ev);