Mercurial > hg > nginx

changeset 3642:ac33852faaac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix
author Igor Sysoev <igor@sysoev.ru>
date Wed, 23 Jun 2010 16:34:54 +0000
parents 6802ba529ec4
children 762712d69672
files src/core/ngx_conf_file.c src/core/ngx_resolver.c src/http/modules/ngx_http_geo_module.c src/http/modules/ngx_http_map_module.c src/http/modules/ngx_http_ssi_filter_module.c src/http/modules/ngx_http_sub_filter_module.c src/http/modules/ngx_http_xslt_filter_module.c src/http/ngx_http_parse.c src/mail/ngx_mail_handler.c src/os/unix/ngx_readv_chain.c src/os/unix/ngx_recv.c src/os/unix/ngx_udp_recv.c src/os/win32/ngx_wsarecv.c
diffstat 13 files changed, 22 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- 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;
             }
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1836,7 +1836,7 @@ ngx_resolver_create_addr_query(ngx_resol
 
     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;
--- 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_c
             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
             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;
         }
 
--- 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
     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;
         }
 
--- 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_reques
 
     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;
--- 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_reques
 
     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;
--- 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_reque
 
         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;
--- 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_req
         /* space* before URI */
         case sw_spaces_before_uri:
 
-            if (ch == '/' ){
+            if (ch == '/') {
                 r->uri_start = p;
                 state = sw_after_slash_in_uri;
                 break;
--- 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 *
 #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_se
                    "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_se
 
     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_
                    "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;
     }
 
--- 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
 
     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
 
     rev->ready = 0;
 
-    if (n == NGX_ERROR){
+    if (n == NGX_ERROR) {
         c->read->error = 1;
     }
 
--- 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_cha
 
     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_cha
 
     rev->ready = 0;
 
-    if (n == NGX_ERROR){
+    if (n == NGX_ERROR) {
         rev->error = 1;
     }
 
--- 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
 
     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
 
     rev->ready = 0;
 
-    if (n == NGX_ERROR){
+    if (n == NGX_ERROR) {
         rev->error = 1;
     }
 
--- 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 
 
         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 
 
         n = ngx_connection_error(c, err, "WSARecv() failed");
 
-        if (n == NGX_ERROR){
+        if (n == NGX_ERROR) {
             rev->error = 1;
         }