diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-09-29 15:12:23 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-09-29 15:12:23 +0000 |
| commit | 11b3baf9f98887f840e169f3882952e69698071b (patch) | |
| tree | 66dc5dd948ea8c0ce9f19b397d32e9319b5b3e5b /usr.sbin/relayd/relayd.c | |
| parent | 0e98fbc399284e7fef87b160f2842b0c3106e843 (diff) | |
spacing
Diffstat (limited to 'usr.sbin/relayd/relayd.c')
| -rw-r--r-- | usr.sbin/relayd/relayd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c index 5c49ac8e933..e7e58bb29d6 100644 --- a/usr.sbin/relayd/relayd.c +++ b/usr.sbin/relayd/relayd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.c,v 1.82 2008/09/29 15:06:52 reyk Exp $ */ +/* $OpenBSD: relayd.c,v 1.83 2008/09/29 15:12:22 reyk Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -370,8 +370,10 @@ merge_config(struct relayd *env, struct relayd *new_env) env->sc_protocount = new_env->sc_protocount; env->sc_relaycount = new_env->sc_relaycount; - memcpy(&env->sc_interval, &new_env->sc_interval, sizeof(env->sc_interval)); - memcpy(&env->sc_timeout, &new_env->sc_timeout, sizeof(env->sc_timeout)); + memcpy(&env->sc_interval, &new_env->sc_interval, + sizeof(env->sc_interval)); + memcpy(&env->sc_timeout, &new_env->sc_timeout, + sizeof(env->sc_timeout)); memcpy(&env->sc_empty_table, &new_env->sc_empty_table, sizeof(env->sc_empty_table)); memcpy(&env->sc_proto_default, &new_env->sc_proto_default, @@ -489,7 +491,8 @@ purge_config(struct relayd *env, u_int8_t what) if (what & PURGE_RELAYS && env->sc_relays != NULL) { while ((rlay = TAILQ_FIRST(env->sc_relays)) != NULL) { TAILQ_REMOVE(env->sc_relays, rlay, rl_entry); - while ((sess = SPLAY_ROOT(&rlay->rl_sessions)) != NULL) { + while ((sess = + SPLAY_ROOT(&rlay->rl_sessions)) != NULL) { SPLAY_REMOVE(session_tree, &rlay->rl_sessions, sess); free(sess); |