summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/bgpd.c
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2004-02-19 13:54:59 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2004-02-19 13:54:59 +0000
commitab07350c16c79d16babb36da629198c73a1497b5 (patch)
tree41595ba2bafa7881347f58e3f922b82c7e80a280 /usr.sbin/bgpd/bgpd.c
parent66c12e8fef994277c60a99cb9e108d32aea1310b (diff)
Make the code more portable. Add some missing header files and make the use
of the queue(3) makros more portable. OK henning@ some time ago.
Diffstat (limited to 'usr.sbin/bgpd/bgpd.c')
-rw-r--r--usr.sbin/bgpd/bgpd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 2beedd33250..fd7c1cb0083 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.c,v 1.79 2004/02/09 23:16:46 henning Exp $ */
+/* $OpenBSD: bgpd.c,v 1.80 2004/02/19 13:54:58 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -378,15 +378,14 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct mrt_head *mrt_l,
&p->conf, sizeof(struct peer_config)) == -1)
return (-1);
}
- for (n = TAILQ_FIRST(&net_l); n != TAILQ_END(&net_l);
- n = TAILQ_FIRST(&net_l)) {
+ while ((n = TAILQ_FIRST(&net_l)) != NULL) {
if (imsg_compose(&ibuf_rde, IMSG_RECONF_NETWORK, 0,
&n->net, sizeof(struct network_config)) == -1)
return (-1);
TAILQ_REMOVE(&net_l, n, network_l);
free(n);
}
- for (r = TAILQ_FIRST(rules_l); r != NULL; r = TAILQ_FIRST(rules_l)) {
+ while ((r = TAILQ_FIRST(rules_l)) != NULL) {
if (imsg_compose(&ibuf_rde, IMSG_RECONF_FILTER, 0,
r, sizeof(struct filter_rule)) == -1)
return (-1);