aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-06-23 16:34:54 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-06-23 16:34:54 +0000
commitaa6936e61a43169bc7ef080e475399f4a514131c (patch)
tree0705cf8d11e5c16508ceb0bab2d882bd91348d22 /src
parent0923d0814826f390a6b69a1ce7f41e55650ea169 (diff)
downloadnginx-aa6936e61a43169bc7ef080e475399f4a514131c.tar.gz
nginx-aa6936e61a43169bc7ef080e475399f4a514131c.zip
style fix
Diffstat (limited to 'src')
-rw-r--r--src/core/ngx_conf_file.c3
-rw-r--r--src/core/ngx_resolver.c2
-rw-r--r--src/http/modules/ngx_http_geo_module.c4
-rw-r--r--src/http/modules/ngx_http_map_module.c2
-rw-r--r--src/http/modules/ngx_http_ssi_filter_module.c2
-rw-r--r--src/http/modules/ngx_http_sub_filter_module.c2
-rw-r--r--src/http/modules/ngx_http_xslt_filter_module.c2
-rw-r--r--src/http/ngx_http_parse.c2
-rw-r--r--src/mail/ngx_mail_handler.c8
-rw-r--r--src/os/unix/ngx_readv_chain.c4
-rw-r--r--src/os/unix/ngx_recv.c4
-rw-r--r--src/os/unix/ngx_udp_recv.c4
-rw-r--r--src/os/win32/ngx_wsarecv.c4
13 files changed, 22 insertions, 21 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 20d9af9e4..83c107329 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -671,7 +671,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
}
} else if (ch == ' ' || ch == '\t' || ch == CR || ch == LF
- || ch == ';' || ch == '{') {
+ || ch == ';' || ch == '{')
+ {
last_space = 1;
found = 1;
}
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index a2b557062..1df86fa95 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1836,7 +1836,7 @@ ngx_resolver_create_addr_query(ngx_resolver_node_t *rn, ngx_resolver_ctx_t *ctx)
p += sizeof(ngx_resolver_query_t);
- for (n = 0; n < 32; n += 8){
+ for (n = 0; n < 32; n += 8) {
d = ngx_sprintf(&p[1], "%ud", (ctx->addr >> n) & 0xff);
*p = (u_char) (d - &p[1]);
p = d;
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 913a1d919..40c11f25f 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -346,7 +346,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
len = a->nelts * sizeof(ngx_http_geo_range_t);
ctx.high->low[i].ranges = ngx_palloc(cf->pool, len);
- if (ctx.high->low[i].ranges == NULL ){
+ if (ctx.high->low[i].ranges == NULL) {
return NGX_CONF_ERROR;
}
@@ -447,7 +447,7 @@ ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
goto failed;
}
- if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK){
+ if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
goto failed;
}
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index abdae0d3b..fe3fa7751 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -374,7 +374,7 @@ ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
if (ngx_strcmp(value[0].data, "include") == 0) {
file = value[1];
- if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK){
+ if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index b994711e7..45626c6b0 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -431,7 +431,7 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
while (ctx->in || ctx->buf) {
- if (ctx->buf == NULL ){
+ if (ctx->buf == NULL) {
ctx->buf = ctx->in->buf;
ctx->in = ctx->in->next;
ctx->pos = ctx->buf->pos;
diff --git a/src/http/modules/ngx_http_sub_filter_module.c b/src/http/modules/ngx_http_sub_filter_module.c
index fe4d92717..d12ed8fe2 100644
--- a/src/http/modules/ngx_http_sub_filter_module.c
+++ b/src/http/modules/ngx_http_sub_filter_module.c
@@ -210,7 +210,7 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
while (ctx->in || ctx->buf) {
- if (ctx->buf == NULL ){
+ if (ctx->buf == NULL) {
ctx->buf = ctx->in->buf;
ctx->in = ctx->in->next;
ctx->pos = ctx->buf->pos;
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index a06b26c28..a5c3da4c7 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -268,7 +268,7 @@ ngx_http_xslt_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
if (ngx_http_xslt_add_chunk(r, ctx, cl->buf) != NGX_OK) {
- if (ctx->ctxt->myDoc){
+ if (ctx->ctxt->myDoc) {
#if (NGX_HTTP_XSLT_REUSE_DTD)
ctx->ctxt->myDoc->extSubset = NULL;
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index f5be2f0e2..949006b47 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -272,7 +272,7 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b)
/* space* before URI */
case sw_spaces_before_uri:
- if (ch == '/' ){
+ if (ch == '/') {
r->uri_start = p;
state = sw_after_slash_in_uri;
break;
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 9cc6a0787..0e37daf48 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -346,7 +346,7 @@ ngx_mail_auth_plain(ngx_mail_session_t *s, ngx_connection_t *c, ngx_uint_t n)
#endif
plain.data = ngx_pnalloc(c->pool, ngx_base64_decoded_length(arg[n].len));
- if (plain.data == NULL){
+ if (plain.data == NULL) {
return NGX_ERROR;
}
@@ -403,7 +403,7 @@ ngx_mail_auth_login_username(ngx_mail_session_t *s, ngx_connection_t *c,
"mail auth login username: \"%V\"", &arg[n]);
s->login.data = ngx_pnalloc(c->pool, ngx_base64_decoded_length(arg[n].len));
- if (s->login.data == NULL){
+ if (s->login.data == NULL) {
return NGX_ERROR;
}
@@ -434,7 +434,7 @@ ngx_mail_auth_login_password(ngx_mail_session_t *s, ngx_connection_t *c)
s->passwd.data = ngx_pnalloc(c->pool,
ngx_base64_decoded_length(arg[0].len));
- if (s->passwd.data == NULL){
+ if (s->passwd.data == NULL) {
return NGX_ERROR;
}
@@ -494,7 +494,7 @@ ngx_mail_auth_cram_md5(ngx_mail_session_t *s, ngx_connection_t *c)
"mail auth cram-md5: \"%V\"", &arg[0]);
s->login.data = ngx_pnalloc(c->pool, ngx_base64_decoded_length(arg[0].len));
- if (s->login.data == NULL){
+ if (s->login.data == NULL) {
return NGX_ERROR;
}
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index f2dd82c89..b65a0d7b8 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -158,7 +158,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
rev->ready = 0;
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
c->read->error = 1;
}
@@ -247,7 +247,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
rev->ready = 0;
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
c->read->error = 1;
}
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index f4d6a2bcc..316e0516d 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -113,7 +113,7 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev->ready = 0;
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
rev->error = 1;
}
@@ -169,7 +169,7 @@ ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev->ready = 0;
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
rev->error = 1;
}
diff --git a/src/os/unix/ngx_udp_recv.c b/src/os/unix/ngx_udp_recv.c
index 25f0738ac..fdcd7fa79 100644
--- a/src/os/unix/ngx_udp_recv.c
+++ b/src/os/unix/ngx_udp_recv.c
@@ -60,7 +60,7 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev->ready = 0;
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
rev->error = 1;
}
@@ -104,7 +104,7 @@ ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev->ready = 0;
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
rev->error = 1;
}
diff --git a/src/os/win32/ngx_wsarecv.c b/src/os/win32/ngx_wsarecv.c
index 314de6e74..032565aaa 100644
--- a/src/os/win32/ngx_wsarecv.c
+++ b/src/os/win32/ngx_wsarecv.c
@@ -43,7 +43,7 @@ ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
n = ngx_connection_error(c, err, "WSARecv() failed");
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
rev->error = 1;
}
@@ -140,7 +140,7 @@ ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
n = ngx_connection_error(c, err, "WSARecv() failed");
- if (n == NGX_ERROR){
+ if (n == NGX_ERROR) {
rev->error = 1;
}