Commit Diff

Commit:
1be2558a99f45bf2af156906cd98ba2a7a97198d
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 - bd31b5ba996cf10c5ce0cca01797a9214066ceb6
commit + 1be2558a99f45bf2af156906cd98ba2a7a97198d
blob - fc03d750081bd0bd95a5a254e83228d41a3cad7c
blob + cbfad0c2c9d27720aba4fa7a24367a6269313fcf
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.58 2023/03/08 04:43:14 guenther Exp $	*/
+/*	$OpenBSD: control.c,v 1.59 2024/11/21 13:10:49 claudio Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -239,7 +239,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 - 233ea86b191fd86c5a373248d1541cb99b8f3c05
blob + a458cd0a01dddd1da51cf4c24167f27b7d0de7d6
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.46 2024/11/21 13:06:27 claudio Exp $	*/
+/*	$OpenBSD: proc.c,v 1.47 2024/11/21 13:10:49 claudio Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -612,8 +612,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);