diff options
| -rw-r--r-- | usr.sbin/hoststated/check_tcp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/hoststated/parse.y | 6 | ||||
| -rw-r--r-- | usr.sbin/relayd/check_tcp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/hoststated/check_tcp.c b/usr.sbin/hoststated/check_tcp.c index 3f6125d195a..6b054bf2d6f 100644 --- a/usr.sbin/hoststated/check_tcp.c +++ b/usr.sbin/hoststated/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.26 2007/09/28 13:29:56 pyr Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.27 2007/11/19 15:20:18 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -145,7 +145,7 @@ tcp_host_up(int s, struct ctl_tcp_event *cte) cte->validate_close = check_http_code; break; case CHECK_HTTP_DIGEST: - cte->validate_read = NULL;; + cte->validate_read = NULL; cte->validate_close = check_http_digest; break; case CHECK_SEND_EXPECT: @@ -237,7 +237,7 @@ tcp_read_buf(int s, short event, void *arg) buf_free(cte->buf); close(cte->s); hce_notify_done(cte->host, "tcp_read_buf: read failed"); - return;; + return; case 0: cte->host->up = HOST_DOWN; (void)cte->validate_close(cte); diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index 4bb3bd2a9b3..689cd6ab752 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.82 2007/11/19 14:48:19 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.83 2007/11/19 15:20:18 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -839,7 +839,7 @@ protonode : nodetype APPEND STRING TO STRING marked { | nodetype EXPECT STRING FROM STRING mark { node.action = NODE_ACTION_EXPECT; node.key = strdup($5); - node.value = strdup($3);; + node.value = strdup($3); if (node.key == NULL || node.value == NULL) fatal("out of memory"); free($5); @@ -849,7 +849,7 @@ protonode : nodetype APPEND STRING TO STRING marked { | nodetype FILTER STRING FROM STRING mark { node.action = NODE_ACTION_FILTER; node.key = strdup($5); - node.value = strdup($3);; + node.value = strdup($3); if (node.key == NULL || node.value == NULL) fatal("out of memory"); free($5); diff --git a/usr.sbin/relayd/check_tcp.c b/usr.sbin/relayd/check_tcp.c index 3f6125d195a..6b054bf2d6f 100644 --- a/usr.sbin/relayd/check_tcp.c +++ b/usr.sbin/relayd/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.26 2007/09/28 13:29:56 pyr Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.27 2007/11/19 15:20:18 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -145,7 +145,7 @@ tcp_host_up(int s, struct ctl_tcp_event *cte) cte->validate_close = check_http_code; break; case CHECK_HTTP_DIGEST: - cte->validate_read = NULL;; + cte->validate_read = NULL; cte->validate_close = check_http_digest; break; case CHECK_SEND_EXPECT: @@ -237,7 +237,7 @@ tcp_read_buf(int s, short event, void *arg) buf_free(cte->buf); close(cte->s); hce_notify_done(cte->host, "tcp_read_buf: read failed"); - return;; + return; case 0: cte->host->up = HOST_DOWN; (void)cte->validate_close(cte); diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 4bb3bd2a9b3..689cd6ab752 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.82 2007/11/19 14:48:19 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.83 2007/11/19 15:20:18 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -839,7 +839,7 @@ protonode : nodetype APPEND STRING TO STRING marked { | nodetype EXPECT STRING FROM STRING mark { node.action = NODE_ACTION_EXPECT; node.key = strdup($5); - node.value = strdup($3);; + node.value = strdup($3); if (node.key == NULL || node.value == NULL) fatal("out of memory"); free($5); @@ -849,7 +849,7 @@ protonode : nodetype APPEND STRING TO STRING marked { | nodetype FILTER STRING FROM STRING mark { node.action = NODE_ACTION_FILTER; node.key = strdup($5); - node.value = strdup($3);; + node.value = strdup($3); if (node.key == NULL || node.value == NULL) fatal("out of memory"); free($5); |