diff options
| author | bket <bket@cvs.openbsd.org> | 2020-06-26 19:06:53 +0000 |
|---|---|---|
| committer | bket <bket@cvs.openbsd.org> | 2020-06-26 19:06:53 +0000 |
| commit | 0bd05411e070b5c47908920706f071f7ccffbc3d (patch) | |
| tree | 0c1b5ed841591df0050ad81ab1e5398a6366e4e7 /usr.sbin | |
| parent | 80b0adb1d96205b461acdab0c0cd9c635314911e (diff) | |
Replace SIMPLEQ concatenation loop with SIMPLEQ_CONCAT
OK florian@, millert@, kn@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c index 26e15b09782..ff8b82310af 100644 --- a/usr.sbin/ospf6d/ospf6d.c +++ b/usr.sbin/ospf6d/ospf6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.c,v 1.46 2020/01/02 10:16:46 denis Exp $ */ +/* $OpenBSD: ospf6d.c,v 1.47 2020/06/26 19:06:52 bket Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -672,10 +672,7 @@ merge_config(struct ospfd_conf *conf, struct ospfd_conf *xconf) SIMPLEQ_REMOVE_HEAD(&conf->redist_list, entry); free(r); } - while ((r = SIMPLEQ_FIRST(&xconf->redist_list)) != NULL) { - SIMPLEQ_REMOVE_HEAD(&xconf->redist_list, entry); - SIMPLEQ_INSERT_TAIL(&conf->redist_list, r, entry); - } + SIMPLEQ_CONCAT(&conf->redist_list, &xconf->redist_list); /* adjust FIB priority if changed */ if (conf->fib_priority != xconf->fib_priority) { |