ldpd: replace hand-rolled 'for' loop with specialized macro

No intentional functional change.

Original author: Kenneth R Westerback <krw@openbsd.org>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ldpd/control.c b/ldpd/control.c
index 8a2280be07bf54ae36e0d1bb91655a635415bb53..0bfe0abc9de56bba7c67adeb2e879e40d63e03d6 100644 (file)
--- a/ldpd/control.c
+++ b/ldpd/control.c
@@ -148,9 +148,10 @@ control_connbyfd(int fd)
 {
        struct ctl_conn *c;
 
-       for (c = TAILQ_FIRST(&ctl_conns); c != NULL && c->iev.ibuf.fd != fd;
-           c = TAILQ_NEXT(c, entry))
-               ;       /* nothing */
+       TAILQ_FOREACH(c, &ctl_conns, entry) {
+               if (c->iev.ibuf.fd == fd)
+                       break;
+       }
 
        return (c);
 }
@@ -160,9 +161,10 @@ control_connbypid(pid_t pid)
 {
        struct ctl_conn *c;
 
-       for (c = TAILQ_FIRST(&ctl_conns); c != NULL && c->iev.ibuf.pid != pid;
-           c = TAILQ_NEXT(c, entry))
-               ;       /* nothing */
+       TAILQ_FOREACH(c, &ctl_conns, entry) {
+               if (c->iev.ibuf.pid == pid)
+                       break;
+       }
 
        return (c);
 }