From: Claudio Jeker <cjeker@diehard.n-r-g.com>
Subject: bgpd: switch to use imsgbuf_get
To: tech@openbsd.org
Date: Thu, 23 Jul 2026 22:32:31 +0200

Trivial conversion of imsg_get to imsgbuf_get. Nothing uses the return
value from imsg_get.

-- 
:wq Claudio

Index: bgpctl/bgpctl.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpctl/bgpctl.c,v
diff -u -p -r1.323 bgpctl.c
--- bgpctl/bgpctl.c	24 Jun 2026 06:02:48 -0000	1.323
+++ bgpctl/bgpctl.c	23 Jul 2026 14:30:07 -0000
@@ -427,8 +427,8 @@ main(int argc, char *argv[])
 
 	while (!done) {
 		while (!done) {
-			if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-				err(1, "imsg_get error");
+			if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+				err(1, "imsgbuf_get error");
 			if (n == 0)
 				break;
 
Index: bgpd/bgpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.c,v
diff -u -p -r1.291 bgpd.c
--- bgpd/bgpd.c	23 Jul 2026 14:04:44 -0000	1.291
+++ bgpd/bgpd.c	23 Jul 2026 14:28:48 -0000
@@ -853,9 +853,8 @@ dispatch_imsg(struct imsgbuf *imsgbuf, i
 
 	rv = 0;
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
 			return (-1);
-
 		if (n == 0)
 			break;
 
Index: bgpd/control.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/control.c,v
diff -u -p -r1.141 control.c
--- bgpd/control.c	21 Jul 2026 08:23:44 -0000	1.141
+++ bgpd/control.c	23 Jul 2026 14:27:50 -0000
@@ -273,9 +273,8 @@ control_dispatch_msg(struct pollfd *pfd,
 		return control_close(c);
 
 	for (;;) {
-		if ((n = imsg_get(&c->imsgbuf, &imsg)) == -1)
+		if ((n = imsgbuf_get(&c->imsgbuf, &imsg)) == -1)
 			return control_close(c);
-
 		if (n == 0)
 			break;
 
Index: bgpd/rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.c,v
diff -u -p -r1.710 rde.c
--- bgpd/rde.c	23 Jul 2026 14:04:44 -0000	1.710
+++ bgpd/rde.c	23 Jul 2026 14:31:20 -0000
@@ -471,8 +471,8 @@ rde_dispatch_imsg_session(struct imsgbuf
 	u_int			 aid;
 
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("rde_dispatch_imsg_session: imsg_get error");
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("rde_dispatch_imsg_session: imsgbuf_get error");
 		if (n == 0)
 			break;
 
@@ -919,8 +919,8 @@ rde_dispatch_imsg_parent(struct imsgbuf 
 	uint16_t		 rid;
 
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("rde_dispatch_imsg_parent: imsg_get error");
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("rde_dispatch_imsg_parent: imsgbuf_get error");
 		if (n == 0)
 			break;
 
@@ -1336,8 +1336,8 @@ rde_dispatch_imsg_rtr(struct imsgbuf *im
 	int			 n;
 
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("rde_dispatch_imsg_parent: imsg_get error");
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("rde_dispatch_imsg_parent: imsgbuf_get error");
 		if (n == 0)
 			break;
 
Index: bgpd/rtr.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rtr.c,v
diff -u -p -r1.35 rtr.c
--- bgpd/rtr.c	11 May 2026 18:46:43 -0000	1.35
+++ bgpd/rtr.c	23 Jul 2026 14:31:07 -0000
@@ -323,8 +323,8 @@ rtr_dispatch_imsg_parent(struct imsgbuf 
 	int			 n, fd;
 
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)
 			break;
 
@@ -466,8 +466,8 @@ rtr_dispatch_imsg_rde(struct imsgbuf *im
 	int		n;
 
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("%s: imsg_get error", __func__);
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("%s: imsgbuf_get error", __func__);
 		if (n == 0)
 			break;
 
Index: bgpd/session.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/session.c,v
diff -u -p -r1.539 session.c
--- bgpd/session.c	23 Jul 2026 11:29:55 -0000	1.539
+++ bgpd/session.c	23 Jul 2026 14:31:11 -0000
@@ -1193,9 +1193,8 @@ session_dispatch_imsg(struct imsgbuf *im
 	uint8_t			 errcode, subcode;
 
 	while (imsgbuf) {
-		if ((n = imsg_get(imsgbuf, &imsg)) == -1)
-			fatal("session_dispatch_imsg: imsg_get error");
-
+		if ((n = imsgbuf_get(imsgbuf, &imsg)) == -1)
+			fatal("session_dispatch_imsg: imsgbuf_get error");
 		if (n == 0)
 			break;