]> git.kaiwu.me - nginx.git/commitdiff
style fix
authorIgor Sysoev <igor@sysoev.ru>
Thu, 22 May 2008 12:09:41 +0000 (12:09 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Thu, 22 May 2008 12:09:41 +0000 (12:09 +0000)
src/core/nginx.c
src/core/ngx_connection.c
src/event/modules/ngx_kqueue_module.c
src/event/ngx_event.c
src/event/ngx_event_pipe.c
src/http/modules/ngx_http_proxy_module.c
src/http/modules/ngx_http_ssi_filter_module.c
src/http/ngx_http_core_module.h
src/http/ngx_http_header_filter_module.c
src/http/ngx_http_special_response.c

index ee636825b0bcb7d35bfd6dbbc30f4b97dca23d50..48e085ba36e4d3e38808834174e5594e5c67ec62 100644 (file)
@@ -1078,7 +1078,7 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                           "invalid character \"%c\" in \"worker_cpu_affinity\"",
                           ch);
-            return NGX_CONF_ERROR ;
+            return NGX_CONF_ERROR;
         }
     }
 
index d22a08ed24f0557f48b2876e9022a9c0c1764630..b49a696f2f800d2ca872bd4746e9a3f9cd457264 100644 (file)
@@ -229,7 +229,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
 
     /* TODO: configurable try number */
 
-    for (tries = 5 ; tries; tries--) {
+    for (tries = 5; tries; tries--) {
         failed = 0;
 
         /* for each listening socket */
index 1b1f9712f4374c0c704a3111bbc0537a0faecd05..1ad2d8d5a47f60610c035167529973ed7332b438 100644 (file)
@@ -446,7 +446,7 @@ ngx_kqueue_set_event(ngx_event_t *ev, ngx_int_t filter, ngx_uint_t flags)
     || __FreeBSD_version >= 500018
                                  |NOTE_REVOKE
 #endif
-                                       ;
+                      ;
         kev->data = 0;
 
     } else {
index d347107428ee3c7594ff73318db0e8bac1d45a18..1ec0119cc840c3c24921303eebd38b8eff051cd6 100644 (file)
@@ -942,7 +942,7 @@ ngx_event_connections(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_str_t  *value;
 
     if (ecf->connections != NGX_CONF_UNSET_UINT) {
-        return "is duplicate" ;
+        return "is duplicate";
     }
 
     if (ngx_strcmp(cmd->name.data, "connections") == 0) {
@@ -977,7 +977,7 @@ ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_event_module_t   *module;
 
     if (ecf->use != NGX_CONF_UNSET_UINT) {
-        return "is duplicate" ;
+        return "is duplicate";
     }
 
     value = cf->args->elts;
index 0b7eb513c7022ef81142992b5cb6687473ca8e36..a9cb21ecb04e59825afa64b0dc03e785325b1bd4 100644 (file)
@@ -880,7 +880,7 @@ ngx_event_pipe_free_shadow_raw_buf(ngx_chain_t **free, ngx_buf_t *buf)
 
     ll = free;
 
-    for (cl = *free ; cl; cl = cl->next) {
+    for (cl = *free; cl; cl = cl->next) {
         if (cl->buf == s) {
             *ll = cl->next;
             break;
index c559d31658eb0f1355c08582c6c4249a3725f697..1d826480164a8183a51ae81c9230a8022006e079 100644 (file)
@@ -1224,7 +1224,7 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
 
     umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
 
-    for ( ;;  ) {
+    for ( ;; ) {
 
         rc = ngx_http_parse_header_line(r, &r->upstream->buffer);
 
index 1d7730d56920a5d1286c6b8b1cca773d07f3a97c..ddd15f4f5d0c990ee90eb75529caf503ef5128bb 100644 (file)
@@ -1637,7 +1637,7 @@ ngx_http_ssi_evaluate_string(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
 
         quoted = 0;
 
-        for (i = 0 ; i < text->len; i++) {
+        for (i = 0; i < text->len; i++) {
             ch = text->data[i];
 
             if (!quoted) {
index 9a9f97bdd2f45416f8ad398427f2a720f23f2fab..bdc15d62826b839d983a743aa20b7207cbde05b7 100644 (file)
@@ -255,10 +255,10 @@ struct ngx_http_core_loc_conf_s {
     ngx_array_t  *locations;
 
     /* pointer to the modules' loc_conf */
-    void        **loc_conf ;
+    void        **loc_conf;
 
     uint32_t      limit_except;
-    void        **limit_except_loc_conf ;
+    void        **limit_except_loc_conf;
 
     ngx_http_handler_pt  handler;
 
@@ -401,7 +401,7 @@ extern ngx_uint_t ngx_http_max_module;
                                                                               \
     r->allow_ranges = 0;                                                      \
     if (r->headers_out.accept_ranges) {                                       \
-        r->headers_out.accept_ranges->hash = 0 ;                              \
+        r->headers_out.accept_ranges->hash = 0                              \
         r->headers_out.accept_ranges = NULL;                                  \
     }
 
index 2dd5b952b41682e8309f237130b6edab27526e99..b7f26f654aed647d17f5d5b4dac65a1f02e52e21 100644 (file)
@@ -536,7 +536,7 @@ ngx_http_header_filter(ngx_http_request_t *r)
         }
 
         b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len);
-        *b->last++ = ':' ; *b->last++ = ' ' ;
+        *b->last++ = ':'; *b->last++ = ' ';
 
         b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len);
         *b->last++ = CR; *b->last++ = LF;
index 32b2ed59954652d426dfc5e80c027cecc921fd30..e1d0eaf4d543f12a9b23ab7d6618de4d30c62f13 100644 (file)
@@ -619,7 +619,7 @@ ngx_http_send_special_response(ngx_http_request_t *r,
     b->last = tail + len;
 
     out[1].buf = b;
-    out[1].next = NULL;;
+    out[1].next = NULL;
 
     if (msie_padding) {
         b = ngx_calloc_buf(r->pool);
@@ -633,7 +633,7 @@ ngx_http_send_special_response(ngx_http_request_t *r,
 
         out[1].next = &out[2];
         out[2].buf = b;
-        out[2].next = NULL;;
+        out[2].next = NULL;
     }
 
     if (r == r->main) {