From: reyk Date: Wed, 6 Aug 2014 12:56:58 +0000 (+0000) Subject: spacing X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7007dbb4213dcb5ea18901ee3b206b5272231e95;p=openbsd spacing --- diff --git a/usr.sbin/httpd/logger.c b/usr.sbin/httpd/logger.c index aa256ed72a2..665db759852 100644 --- a/usr.sbin/httpd/logger.c +++ b/usr.sbin/httpd/logger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logger.c,v 1.4 2014/08/06 12:29:43 jsg Exp $ */ +/* $OpenBSD: logger.c,v 1.5 2014/08/06 12:56:58 reyk Exp $ */ /* * Copyright (c) 2014 Reyk Floeter @@ -109,7 +109,7 @@ logger_open_file(const char *name) } log->log_id = ++last_log_id; - (void)strlcpy(log->log_name, name, sizeof(log->log_name)); + (void)strlcpy(log->log_name, name, sizeof(log->log_name)); /* The file will be opened by the parent process */ log->log_fd = -1; diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index 9daf57c7592..a2a4107d2cb 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.29 2014/08/06 02:04:42 jsing Exp $ */ +/* $OpenBSD: parse.y,v 1.30 2014/08/06 12:56:58 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter @@ -307,13 +307,13 @@ serveroptsl : LISTEN ON STRING port optssl { s->srv_conf.flags |= SRVFLAG_SSL; } } - | TCP { + | TCP { if (parentsrv != NULL) { yyerror("tcp flags inside location"); YYERROR; } } tcpip - | CONNECTION { + | CONNECTION { if (parentsrv != NULL) { yyerror("connection options inside location"); YYERROR; diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c index 77168e95ca3..523beccfe3a 100644 --- a/usr.sbin/httpd/server.c +++ b/usr.sbin/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.34 2014/08/06 11:24:12 reyk Exp $ */ +/* $OpenBSD: server.c,v 1.35 2014/08/06 12:56:58 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter @@ -555,11 +555,11 @@ server_ssl_readcb(int fd, short event, void *arg) (*bufev->readcb)(bufev, bufev->cbarg); return; -retry: + retry: server_bufferevent_add(&bufev->ev_read, bufev->timeout_read); return; -err: + err: (*bufev->errorcb)(bufev, what, bufev->cbarg); } @@ -611,12 +611,12 @@ server_ssl_writecb(int fd, short event, void *arg) (*bufev->writecb)(bufev, bufev->cbarg); return; -retry: + retry: if (clt->clt_buflen != 0) server_bufferevent_add(&bufev->ev_write, bufev->timeout_write); return; -err: + err: if (clt->clt_buf != NULL) { free(clt->clt_buf); clt->clt_buf = NULL;