diff options
| author |   krw <krw@openbsd.org> | 2017-01-05 12:42:18 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2017-01-05 12:42:18 +0000 |
| commit | 54c95b7a05c13730c666209dd1d5d4b9646ab36a (patch) | |
| tree | e723dbe9a6b55d44a1548c69104270c0c8a8fcd3 /usr.sbin/ripd | |
| parent | Remove some unnecessary code abstractions and while here remove a (diff) | |
| download | wireguard-openbsd-54c95b7a05c13730c666209dd1d5d4b9646ab36a.tar.xz wireguard-openbsd-54c95b7a05c13730c666209dd1d5d4b9646ab36a.zip | |
Replace symset()'s hand-rolled for(;;) traversal of 'symhead' TAILQ
with more modern TAILQ_FOREACH(). This what symget() was already
doing.
Add paranoia '{}' around body of symget()'s TAILQ_FOREACH().
No intentional functional change.
ok bluhm@ otto@
Diffstat (limited to 'usr.sbin/ripd')
| -rw-r--r-- | usr.sbin/ripd/parse.y | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y index 4851038429f..8d74603e22b 100644 --- a/usr.sbin/ripd/parse.y +++ b/usr.sbin/ripd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.35 2016/06/21 21:35:25 benno Exp $ */ +/* $OpenBSD: parse.y,v 1.36 2017/01/05 12:42:19 krw Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -809,9 +809,10 @@ symset(const char *nam, const char *val, int persist) { struct sym *sym; - for (sym = TAILQ_FIRST(&symhead); sym && strcmp(nam, sym->nam); - sym = TAILQ_NEXT(sym, entry)) - ; /* nothing */ + TAILQ_FOREACH(sym, &symhead, entry) { + if (strcmp(nam, sym->nam) == 0) + break; + } if (sym != NULL) { if (sym->persist == 1) @@ -870,11 +871,12 @@ symget(const char *nam) { struct sym *sym; - TAILQ_FOREACH(sym, &symhead, entry) + TAILQ_FOREACH(sym, &symhead, entry) { if (strcmp(nam, sym->nam) == 0) { sym->used = 1; return (sym->val); } + } return (NULL); } |