summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2007-01-03 09:45:30 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2007-01-03 09:45:30 +0000
commit42f78c7839def9b2dd2fbdcfb204a780b16e37a5 (patch)
tree72672a49f6760459626320a80efa9aad85d457e7
parent875e2ef53f679775f21613b6e76ffea5074b0e06 (diff)
spacing
-rw-r--r--usr.sbin/hostated/check_icmp.c10
-rw-r--r--usr.sbin/hostated/hostated.h4
-rw-r--r--usr.sbin/hostated/parse.y7
-rw-r--r--usr.sbin/hoststated/check_icmp.c10
-rw-r--r--usr.sbin/hoststated/hoststated.h4
-rw-r--r--usr.sbin/hoststated/parse.y7
-rw-r--r--usr.sbin/relayd/check_icmp.c10
-rw-r--r--usr.sbin/relayd/parse.y7
-rw-r--r--usr.sbin/relayd/relayd.h4
9 files changed, 33 insertions, 30 deletions
diff --git a/usr.sbin/hostated/check_icmp.c b/usr.sbin/hostated/check_icmp.c
index 3cf5360e01f..2880d4f5e84 100644
--- a/usr.sbin/hostated/check_icmp.c
+++ b/usr.sbin/hostated/check_icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check_icmp.c,v 1.4 2006/12/25 19:05:41 reyk Exp $ */
+/* $OpenBSD: check_icmp.c,v 1.5 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -255,7 +255,7 @@ recv_icmp4(int s, short event, void *arg)
socklen_t len;
struct icmp *icp;
struct ctl_icmp_event *cie = arg;
- u_char packet[datalen];
+ u_char packet[datalen];
struct host *host;
struct table *table;
ssize_t i;
@@ -285,7 +285,7 @@ recv_icmp4(int s, short event, void *arg)
}
return;
}
-
+
len = sizeof(struct sockaddr_in);
bzero(&packet, sizeof(packet));
bzero(&ss, sizeof(ss));
@@ -315,10 +315,10 @@ recv_icmp4(int s, short event, void *arg)
host->flags |= F_CHECK_DONE;
if (icmp4_checks_done(cie)) {
hce_notify_done(host, "recv_icmp4: all done");
- return;
+ return;
}
hce_notify_done(host, "recv_icmp4: host");
-
+
if (gettimeofday(&tv_now, NULL))
fatal("recv_icmp4: gettimeofday");
diff --git a/usr.sbin/hostated/hostated.h b/usr.sbin/hostated/hostated.h
index 1706b3659ef..03338b90519 100644
--- a/usr.sbin/hostated/hostated.h
+++ b/usr.sbin/hostated/hostated.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostated.h,v 1.7 2007/01/03 09:42:30 reyk Exp $ */
+/* $OpenBSD: hostated.h,v 1.8 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -137,7 +137,7 @@ struct ctl_icmp_event {
struct ctl_tcp_event {
int s;
struct buf *buf;
- struct host *host;
+ struct host *host;
struct table *table;
struct timeval tv_start;
};
diff --git a/usr.sbin/hostated/parse.y b/usr.sbin/hostated/parse.y
index bf414099696..c50e5708cfa 100644
--- a/usr.sbin/hostated/parse.y
+++ b/usr.sbin/hostated/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.7 2007/01/03 09:42:30 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.8 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -297,7 +297,8 @@ table : TABLE STRING {
YYERROR;
}
tb->id = last_table_id++;
- bcopy(&conf->timeout, &tb->timeout, sizeof(struct timeval));
+ bcopy(&conf->timeout, &tb->timeout,
+ sizeof(struct timeval));
if (last_table_id == UINT_MAX) {
yyerror("too many tables defined");
YYERROR;
@@ -360,7 +361,7 @@ tableoptsl : host {
YYERROR;
}
if (strlcpy(table->digest, $5,
- sizeof (table->digest)) >= sizeof (table->digest)) {
+ sizeof(table->digest)) >= sizeof (table->digest)) {
yyerror("http digest truncated");
free($3);
free($5);
diff --git a/usr.sbin/hoststated/check_icmp.c b/usr.sbin/hoststated/check_icmp.c
index 3cf5360e01f..2880d4f5e84 100644
--- a/usr.sbin/hoststated/check_icmp.c
+++ b/usr.sbin/hoststated/check_icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check_icmp.c,v 1.4 2006/12/25 19:05:41 reyk Exp $ */
+/* $OpenBSD: check_icmp.c,v 1.5 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -255,7 +255,7 @@ recv_icmp4(int s, short event, void *arg)
socklen_t len;
struct icmp *icp;
struct ctl_icmp_event *cie = arg;
- u_char packet[datalen];
+ u_char packet[datalen];
struct host *host;
struct table *table;
ssize_t i;
@@ -285,7 +285,7 @@ recv_icmp4(int s, short event, void *arg)
}
return;
}
-
+
len = sizeof(struct sockaddr_in);
bzero(&packet, sizeof(packet));
bzero(&ss, sizeof(ss));
@@ -315,10 +315,10 @@ recv_icmp4(int s, short event, void *arg)
host->flags |= F_CHECK_DONE;
if (icmp4_checks_done(cie)) {
hce_notify_done(host, "recv_icmp4: all done");
- return;
+ return;
}
hce_notify_done(host, "recv_icmp4: host");
-
+
if (gettimeofday(&tv_now, NULL))
fatal("recv_icmp4: gettimeofday");
diff --git a/usr.sbin/hoststated/hoststated.h b/usr.sbin/hoststated/hoststated.h
index 6dbb46819e4..f0d6839c4f5 100644
--- a/usr.sbin/hoststated/hoststated.h
+++ b/usr.sbin/hoststated/hoststated.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hoststated.h,v 1.7 2007/01/03 09:42:30 reyk Exp $ */
+/* $OpenBSD: hoststated.h,v 1.8 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -137,7 +137,7 @@ struct ctl_icmp_event {
struct ctl_tcp_event {
int s;
struct buf *buf;
- struct host *host;
+ struct host *host;
struct table *table;
struct timeval tv_start;
};
diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y
index bf414099696..c50e5708cfa 100644
--- a/usr.sbin/hoststated/parse.y
+++ b/usr.sbin/hoststated/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.7 2007/01/03 09:42:30 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.8 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -297,7 +297,8 @@ table : TABLE STRING {
YYERROR;
}
tb->id = last_table_id++;
- bcopy(&conf->timeout, &tb->timeout, sizeof(struct timeval));
+ bcopy(&conf->timeout, &tb->timeout,
+ sizeof(struct timeval));
if (last_table_id == UINT_MAX) {
yyerror("too many tables defined");
YYERROR;
@@ -360,7 +361,7 @@ tableoptsl : host {
YYERROR;
}
if (strlcpy(table->digest, $5,
- sizeof (table->digest)) >= sizeof (table->digest)) {
+ sizeof(table->digest)) >= sizeof (table->digest)) {
yyerror("http digest truncated");
free($3);
free($5);
diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c
index 3cf5360e01f..2880d4f5e84 100644
--- a/usr.sbin/relayd/check_icmp.c
+++ b/usr.sbin/relayd/check_icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check_icmp.c,v 1.4 2006/12/25 19:05:41 reyk Exp $ */
+/* $OpenBSD: check_icmp.c,v 1.5 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -255,7 +255,7 @@ recv_icmp4(int s, short event, void *arg)
socklen_t len;
struct icmp *icp;
struct ctl_icmp_event *cie = arg;
- u_char packet[datalen];
+ u_char packet[datalen];
struct host *host;
struct table *table;
ssize_t i;
@@ -285,7 +285,7 @@ recv_icmp4(int s, short event, void *arg)
}
return;
}
-
+
len = sizeof(struct sockaddr_in);
bzero(&packet, sizeof(packet));
bzero(&ss, sizeof(ss));
@@ -315,10 +315,10 @@ recv_icmp4(int s, short event, void *arg)
host->flags |= F_CHECK_DONE;
if (icmp4_checks_done(cie)) {
hce_notify_done(host, "recv_icmp4: all done");
- return;
+ return;
}
hce_notify_done(host, "recv_icmp4: host");
-
+
if (gettimeofday(&tv_now, NULL))
fatal("recv_icmp4: gettimeofday");
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index bf414099696..c50e5708cfa 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.7 2007/01/03 09:42:30 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.8 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -297,7 +297,8 @@ table : TABLE STRING {
YYERROR;
}
tb->id = last_table_id++;
- bcopy(&conf->timeout, &tb->timeout, sizeof(struct timeval));
+ bcopy(&conf->timeout, &tb->timeout,
+ sizeof(struct timeval));
if (last_table_id == UINT_MAX) {
yyerror("too many tables defined");
YYERROR;
@@ -360,7 +361,7 @@ tableoptsl : host {
YYERROR;
}
if (strlcpy(table->digest, $5,
- sizeof (table->digest)) >= sizeof (table->digest)) {
+ sizeof(table->digest)) >= sizeof (table->digest)) {
yyerror("http digest truncated");
free($3);
free($5);
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index d001ef0b09c..c8f02dc181f 100644
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: relayd.h,v 1.7 2007/01/03 09:42:30 reyk Exp $ */
+/* $OpenBSD: relayd.h,v 1.8 2007/01/03 09:45:29 reyk Exp $ */
/*
* Copyright (c) 2006 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -137,7 +137,7 @@ struct ctl_icmp_event {
struct ctl_tcp_event {
int s;
struct buf *buf;
- struct host *host;
+ struct host *host;
struct table *table;
struct timeval tv_start;
};