diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-07-01 18:59:16 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-07-01 18:59:16 +0000 |
| commit | 92ab15d29618dd968fdab5ee0be18ce4e5c3f7c7 (patch) | |
| tree | 74c1d5a470891f44d61933c0c3882f762a3e0eb8 /usr.sbin/bgpctl | |
| parent | 3168950c92fdf19f473ed9a0ceb84c0eb512d109 (diff) | |
fix breakage; if this proves to be wrong, will be fixed later. at least
make build will work now.
Diffstat (limited to 'usr.sbin/bgpctl')
| -rw-r--r-- | usr.sbin/bgpctl/bgpctl.c | 6 | ||||
| -rw-r--r-- | usr.sbin/bgpctl/parser.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c index 002ac46c9a0..00142eca400 100644 --- a/usr.sbin/bgpctl/bgpctl.c +++ b/usr.sbin/bgpctl/bgpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpctl.c,v 1.87 2005/06/13 08:16:30 claudio Exp $ */ +/* $OpenBSD: bgpctl.c,v 1.88 2005/07/01 18:59:14 fgsch Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -986,10 +986,10 @@ send_filterset(struct imsgbuf *i, struct filter_set_head *set) { struct filter_set *s; - while ((s = SIMPLEQ_FIRST(set)) != NULL) { + while ((s = TAILQ_FIRST(set)) != NULL) { imsg_compose(i, IMSG_FILTER_SET, 0, 0, -1, s, sizeof(struct filter_set)); - SIMPLEQ_REMOVE_HEAD(set, entry); + TAILQ_REMOVE(set, s, entry); free(s); } } diff --git a/usr.sbin/bgpctl/parser.c b/usr.sbin/bgpctl/parser.c index 46de769f9c1..c45c96b4992 100644 --- a/usr.sbin/bgpctl/parser.c +++ b/usr.sbin/bgpctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.17 2005/06/16 18:43:00 henning Exp $ */ +/* $OpenBSD: parser.c,v 1.18 2005/07/01 18:59:15 fgsch Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -259,7 +259,7 @@ parse(int argc, char *argv[]) const struct token *match; bzero(&res, sizeof(res)); - SIMPLEQ_INIT(&res.set); + TAILQ_INIT(&res.set); while (argc > 0) { if ((match = match_token(argv[0], table)) == NULL) { @@ -408,7 +408,7 @@ match_token(const char *word, const struct token table[]) sizeof(fs->action.pftable)) >= sizeof(fs->action.pftable)) errx(1, "pftable name too long"); - SIMPLEQ_INSERT_TAIL(&res.set, fs, entry); + TAILQ_INSERT_TAIL(&res.set, fs, entry); match++; t = &table[i]; } @@ -604,7 +604,7 @@ parse_number(const char *word, struct parse_result *r, enum token_type type) errx(1, "king bula sez bad things happen"); } - SIMPLEQ_INSERT_TAIL(&r->set, fs, entry); + TAILQ_INSERT_TAIL(&r->set, fs, entry); return (1); } @@ -698,7 +698,7 @@ done: fs->action.community.as = as; fs->action.community.type = type; - SIMPLEQ_INSERT_TAIL(&r->set, fs, entry); + TAILQ_INSERT_TAIL(&r->set, fs, entry); return (1); } @@ -723,7 +723,7 @@ parse_nexthop(const char *word, struct parse_result *r) return (0); } - SIMPLEQ_INSERT_TAIL(&r->set, fs, entry); + TAILQ_INSERT_TAIL(&r->set, fs, entry); return (1); } |