summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/acme-client/parse.y5
-rw-r--r--usr.sbin/bgpd/parse.y5
-rw-r--r--usr.sbin/dvmrpd/parse.y5
-rw-r--r--usr.sbin/eigrpd/parse.y5
-rw-r--r--usr.sbin/hostapd/parse.y5
-rw-r--r--usr.sbin/httpd/parse.y5
-rw-r--r--usr.sbin/ifstated/parse.y5
-rw-r--r--usr.sbin/iscsictl/parse.y5
-rw-r--r--usr.sbin/ldapd/parse.y5
-rw-r--r--usr.sbin/ldpd/parse.y5
-rw-r--r--usr.sbin/ospf6d/parse.y5
-rw-r--r--usr.sbin/ospfd/parse.y5
-rw-r--r--usr.sbin/relayd/parse.y5
-rw-r--r--usr.sbin/ripd/parse.y5
-rw-r--r--usr.sbin/smtpd/parse.y5
-rw-r--r--usr.sbin/snmpd/parse.y5
-rw-r--r--usr.sbin/vmd/parse.y5
-rw-r--r--usr.sbin/ypldap/parse.y5
18 files changed, 36 insertions, 54 deletions
diff --git a/usr.sbin/acme-client/parse.y b/usr.sbin/acme-client/parse.y
index 7f61407dfc2..f23219e97e5 100644
--- a/usr.sbin/acme-client/parse.y
+++ b/usr.sbin/acme-client/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.3 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.4 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -691,8 +691,7 @@ parse_config(const char *filename, int opts)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->opts & ACME_OPT_VERBOSE) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 43de15b7e96..06d614b9f57 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.292 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.293 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -2755,8 +2755,7 @@ parse_config(char *filename, struct bgpd_config *xconf, struct peer **xpeers)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((cmd_opts & BGPD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro \"%s\" not "
"used\n", sym->nam);
diff --git a/usr.sbin/dvmrpd/parse.y b/usr.sbin/dvmrpd/parse.y
index 023c89dfc53..6a2dac8581d 100644
--- a/usr.sbin/dvmrpd/parse.y
+++ b/usr.sbin/dvmrpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.31 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.32 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -767,8 +767,7 @@ parse_config(char *filename, int opts)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->opts & DVMRPD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/eigrpd/parse.y b/usr.sbin/eigrpd/parse.y
index 2dd25eadfd9..270f266d0ff 100644
--- a/usr.sbin/eigrpd/parse.y
+++ b/usr.sbin/eigrpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.20 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.21 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -988,8 +988,7 @@ parse_config(char *filename)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((global.cmd_opts & EIGRPD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/hostapd/parse.y b/usr.sbin/hostapd/parse.y
index b7dab97d3e9..eff199d93a1 100644
--- a/usr.sbin/hostapd/parse.y
+++ b/usr.sbin/hostapd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.52 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.53 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -1774,8 +1774,7 @@ hostapd_parse_file(struct hostapd_config *cfg)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if (!sym->used)
hostapd_log(HOSTAPD_LOG_VERBOSE,
"warning: macro '%s' not used", sym->nam);
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 39d12732c7a..967aeec5427 100644
--- a/usr.sbin/httpd/parse.y
+++ b/usr.sbin/httpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.86 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.87 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -1598,8 +1598,7 @@ parse_config(const char *filename, struct httpd *x_conf)
endprotoent();
/* Free macros */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if (!sym->persist) {
free(sym->nam);
free(sym->val);
diff --git a/usr.sbin/ifstated/parse.y b/usr.sbin/ifstated/parse.y
index 4ef46bfab16..70f0e356d85 100644
--- a/usr.sbin/ifstated/parse.y
+++ b/usr.sbin/ifstated/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.39 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.40 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org>
@@ -774,8 +774,7 @@ parse_config(char *filename, int opts)
}
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->opts & IFSD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/iscsictl/parse.y b/usr.sbin/iscsictl/parse.y
index 889c8295ba7..699ce7a298e 100644
--- a/usr.sbin/iscsictl/parse.y
+++ b/usr.sbin/iscsictl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.9 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -695,8 +695,7 @@ parse_config(char *filename)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if (!sym->persist) {
free(sym->nam);
free(sym->val);
diff --git a/usr.sbin/ldapd/parse.y b/usr.sbin/ldapd/parse.y
index b4f790988b4..82e7fbfc19d 100644
--- a/usr.sbin/ldapd/parse.y
+++ b/usr.sbin/ldapd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.21 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.22 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martinh@openbsd.org>
@@ -814,8 +814,7 @@ parse_config(char *filename)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
log_debug("warning: macro \"%s\" not used", sym->nam);
if (!sym->persist) {
free(sym->nam);
diff --git a/usr.sbin/ldpd/parse.y b/usr.sbin/ldpd/parse.y
index 36f60734200..593058acf97 100644
--- a/usr.sbin/ldpd/parse.y
+++ b/usr.sbin/ldpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.58 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.59 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2013, 2015, 2016 Renato Westphal <renato@openbsd.org>
@@ -1196,8 +1196,7 @@ parse_config(char *filename)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((global.cmd_opts & LDPD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y
index 527f09354eb..69953a912c7 100644
--- a/usr.sbin/ospf6d/parse.y
+++ b/usr.sbin/ospf6d/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.29 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.30 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -938,8 +938,7 @@ parse_config(char *filename, int opts)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->opts & OSPFD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y
index ff6061ac45f..78d5e969f50 100644
--- a/usr.sbin/ospfd/parse.y
+++ b/usr.sbin/ospfd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.82 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.83 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -1126,8 +1126,7 @@ parse_config(char *filename, int opts)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->opts & OSPFD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index a6c090dbc91..57ab789db8f 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.213 2017/01/05 12:42:18 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.214 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -2606,8 +2606,7 @@ parse_config(const char *filename, struct relayd *x_conf)
endprotoent();
/* Free macros */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if (!sym->persist) {
free(sym->nam);
free(sym->val);
diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y
index 8d74603e22b..2a56760122b 100644
--- a/usr.sbin/ripd/parse.y
+++ b/usr.sbin/ripd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.36 2017/01/05 12:42:19 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.37 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -780,8 +780,7 @@ parse_config(char *filename, int opts)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->opts & RIPD_OPT_VERBOSE2) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index 95475c03a9d..0257a46401b 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.192 2017/01/05 12:42:19 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.193 2017/01/05 13:53:09 krw Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -2011,8 +2011,7 @@ parse_config(struct smtpd *x_conf, const char *filename, int opts)
}
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->sc_opts & SMTPD_OPT_VERBOSE) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/snmpd/parse.y b/usr.sbin/snmpd/parse.y
index 253343aab0b..efd1159c3ab 100644
--- a/usr.sbin/snmpd/parse.y
+++ b/usr.sbin/snmpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.42 2017/01/05 12:42:19 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.43 2017/01/05 13:53:10 krw Exp $ */
/*
* Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -1014,8 +1014,7 @@ parse_config(const char *filename, u_int flags)
}
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((conf->sc_flags & SNMPD_F_VERBOSE) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y
index 9c9dea2813f..3337032e128 100644
--- a/usr.sbin/vmd/parse.y
+++ b/usr.sbin/vmd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.18 2017/01/05 12:42:19 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.19 2017/01/05 13:53:10 krw Exp $ */
/*
* Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -872,8 +872,7 @@ parse_config(const char *filename)
endservent();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if (!sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);
diff --git a/usr.sbin/ypldap/parse.y b/usr.sbin/ypldap/parse.y
index 3a65ffb162e..e0a8a6e22f3 100644
--- a/usr.sbin/ypldap/parse.y
+++ b/usr.sbin/ypldap/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.20 2017/01/05 12:42:19 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.21 2017/01/05 13:53:10 krw Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -749,8 +749,7 @@ parse_config(struct env *x_conf, const char *filename, int opts)
popfile();
/* Free macros and check which have not been used. */
- for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) {
- next = TAILQ_NEXT(sym, entry);
+ TAILQ_FOREACH_SAFE(sym, &symhead, entry, next) {
if ((opts & YPLDAP_OPT_VERBOSE) && !sym->used)
fprintf(stderr, "warning: macro '%s' not "
"used\n", sym->nam);