From 041405e35ae0afe6447043e80730e711a80af365 Mon Sep 17 00:00:00 2001 From: reyk Date: Thu, 17 Jul 2008 16:41:06 +0000 Subject: [PATCH] final reorder diff to use TAILQ_INSERT_TAIL instead of TAILQ_INSERT_HEAD. now tables and relays are also matching the order in the config file. ok pyr@ --- usr.sbin/relayd/parse.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 3c3ffbac72a..3c7cb2b61a7 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.118 2008/07/17 16:28:07 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.119 2008/07/17 16:41:06 reyk Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter @@ -369,7 +369,7 @@ rdr : REDIRECT STRING { } if (!(rdr->conf.flags & F_DISABLE)) rdr->conf.flags |= F_ADD; - TAILQ_INSERT_HEAD(conf->sc_rdrs, rdr, entry); + TAILQ_INSERT_TAIL(conf->sc_rdrs, rdr, entry); tableport = 0; rdr = NULL; } @@ -742,7 +742,7 @@ proto : proto_type PROTO STRING { YYERROR; } - TAILQ_INSERT_HEAD(conf->sc_protos, proto, entry); + TAILQ_INSERT_TAIL(conf->sc_protos, proto, entry); } ; @@ -1100,7 +1100,7 @@ relay : RELAY STRING { } conf->sc_relaycount++; SPLAY_INIT(&rlay->rl_sessions); - TAILQ_INSERT_HEAD(conf->sc_relays, rlay, rl_entry); + TAILQ_INSERT_TAIL(conf->sc_relays, rlay, rl_entry); tableport = 0; rlay = NULL; } @@ -2139,7 +2139,7 @@ table_inherit(struct table *tb) } conf->sc_tablecount++; - TAILQ_INSERT_HEAD(conf->sc_tables, tb, entry); + TAILQ_INSERT_TAIL(conf->sc_tables, tb, entry); return (tb); } -- 2.20.1