summaryrefslogtreecommitdiff
path: root/usr.sbin/relayd/relayd.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2007-02-22 05:58:07 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2007-02-22 05:58:07 +0000
commitbcefe5c2e682e793f76d803b02bb23b885b658c9 (patch)
tree5a062d7d8ba6e6d618a2a29fc4ebbbed35c9cada /usr.sbin/relayd/relayd.c
parent9e07dc64a7f609b15dbf537d3f984b72641c918e (diff)
spacing
Diffstat (limited to 'usr.sbin/relayd/relayd.c')
-rw-r--r--usr.sbin/relayd/relayd.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 093b35fb849..ff4690a825f 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.c,v 1.17 2007/02/22 03:32:39 reyk Exp $ */
+/* $OpenBSD: relayd.c,v 1.18 2007/02/22 05:58:06 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -64,7 +64,7 @@ void
main_sig_handler(int sig, short event, void *arg)
{
struct hoststated *env = arg;
- int die = 0;
+ int die = 0;
log_debug("signal %d", sig);
@@ -173,13 +173,17 @@ main(int argc, char *argv[])
log_info("startup");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_parent2pfe) == -1)
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+ pipe_parent2pfe) == -1)
fatal("socketpair");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_parent2hce) == -1)
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+ pipe_parent2hce) == -1)
fatal("socketpair");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_parent2relay) == -1)
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+ pipe_parent2relay) == -1)
fatal("socketpair");
- if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, pipe_pfe2hce) == -1)
+ if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
+ pipe_pfe2hce) == -1)
fatal("socketpair");
for (c = 0; c < env.prefork_relay; c++) {
if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC,
@@ -589,7 +593,7 @@ expand_string(char *label, size_t len, const char *srch, const char *repl)
return (-1);
}
p = q = label;
- while ((q = strstr(p, srch)) != NULL) {
+ while ((q = strstr(p, srch)) != NULL) {
*q = '\0';
if ((strlcat(tmp, p, len) >= len) ||
(strlcat(tmp, repl, len) >= len)) {