various coding style fixes caught by ngx-releng.

Author: agentzh

src/ngx_http_srcache_fetch.c

@@ -377,7 +377,7 @@ ngx_http_srcache_fetch_subrequest(ngx_http_request_t *r,
     }
 
     if (ngx_http_complex_value(r, &conf->fetch->args, &parsed_sr->args)
-            != NGX_OK)
+        != NGX_OK)
     {
         return NGX_ERROR;
     }
@@ -416,7 +416,7 @@ ngx_http_srcache_fetch_subrequest(ngx_http_request_t *r,
        parsed_sr->location.data);
 
     dd("fetch args: %.*s", (int) parsed_sr->args.len,
-            parsed_sr->args.data);
+       parsed_sr->args.data);
 
     rc = ngx_http_subrequest(r, &parsed_sr->location, &parsed_sr->args,
                              &sr, psr, flags);

src/ngx_http_srcache_filter_module.c

@@ -48,12 +48,12 @@ static ngx_str_t  ngx_http_srcache_hide_headers[] = {
 
 
 static ngx_conf_bitmask_t  ngx_http_srcache_cache_method_mask[] = {
-   { ngx_string("GET"),  NGX_HTTP_GET},
-   { ngx_string("HEAD"), NGX_HTTP_HEAD },
-   { ngx_string("POST"), NGX_HTTP_POST },
-   { ngx_string("PUT"), NGX_HTTP_PUT },
-   { ngx_string("DELETE"), NGX_HTTP_DELETE },
-   { ngx_null_string, 0 }
+    { ngx_string("GET"),  NGX_HTTP_GET},
+    { ngx_string("HEAD"), NGX_HTTP_HEAD },
+    { ngx_string("POST"), NGX_HTTP_POST },
+    { ngx_string("PUT"), NGX_HTTP_PUT },
+    { ngx_string("DELETE"), NGX_HTTP_DELETE },
+    { ngx_null_string, 0 }
 };
 
 
@@ -303,12 +303,12 @@ ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_ptr_value(conf->store, prev->store, NULL);
 
     ngx_conf_merge_size_value(conf->buf_size, prev->buf_size,
-            (size_t) ngx_pagesize);
+                              (size_t) ngx_pagesize);
 
     ngx_conf_merge_size_value(conf->store_max_size, prev->store_max_size, 0);
 
     ngx_conf_merge_size_value(conf->header_buf_size, prev->header_buf_size,
-            (size_t) ngx_pagesize);
+                              (size_t) ngx_pagesize);
 
     if (conf->fetch_skip == NULL) {
         conf->fetch_skip = prev->fetch_skip;
@@ -340,7 +340,7 @@ ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->default_expire, prev->default_expire, 60);
 
     ngx_conf_merge_value(conf->ignore_content_encoding,
-            prev->ignore_content_encoding, 0);
+                         prev->ignore_content_encoding, 0);
 
     hash.max_size = 512;
     hash.bucket_size = ngx_align(64, ngx_cacheline_size);
@@ -396,8 +396,8 @@ ngx_http_srcache_conf_set_request(ngx_conf_t *cf, ngx_command_t *cmd,
 
     if (rp->method == NGX_HTTP_UNKNOWN) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                "%V specifies bad HTTP method %V",
-                &cmd->name, method_name);
+                           "%V specifies bad HTTP method %V",
+                           &cmd->name, method_name);
 
         return NGX_CONF_ERROR;
     }
@@ -589,16 +589,16 @@ ngx_http_srcache_store_statuses(ngx_conf_t *cf, ngx_command_t *cmd,
         status = ngx_atoi(value[i].data, value[i].len);
         if (status == NGX_ERROR) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                    "status code \"%V\" is an invalid number",
-                    &value[i]);
+                               "status code \"%V\" is an invalid number",
+                               &value[i]);
 
             return NGX_CONF_ERROR;
         }
 
         if (status < 0) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                    "status code \"%V\" is not a positive number",
-                    &value[i]);
+                               "status code \"%V\" is not a positive number",
+                               &value[i]);
 
             return NGX_CONF_ERROR;
         }
@@ -609,7 +609,7 @@ ngx_http_srcache_store_statuses(ngx_conf_t *cf, ngx_command_t *cmd,
     slcf->store_statuses[i - 1] = 0;
 
     ngx_sort(slcf->store_statuses, n, sizeof(ngx_int_t),
-            ngx_http_srcache_cmp_int);
+             ngx_http_srcache_cmp_int);
 
 #if 0
     for (i = 0; i < n; i++) {

src/ngx_http_srcache_filter_module.h

@@ -94,7 +94,7 @@ typedef struct {
 } ngx_http_srcache_main_conf_t;
 
 
-typedef struct ngx_http_srcache_ctx_s ngx_http_srcache_ctx_t;
+typedef struct ngx_http_srcache_ctx_s  ngx_http_srcache_ctx_t;
 
 typedef struct ngx_http_srcache_postponed_request_s
     ngx_http_srcache_postponed_request_t;
@@ -108,7 +108,7 @@ struct ngx_http_srcache_ctx_s {
     void                            *store_wev_handler_ctx;
 
     ngx_int_t                      (*process_header)(ngx_http_request_t *r,
-                                        ngx_buf_t *b);
+                                                     ngx_buf_t *b);
 
     time_t                           valid_sec;
 

src/ngx_http_srcache_headers.c

@@ -246,7 +246,7 @@ ngx_http_srcache_process_last_modified(ngx_http_request_t *r,
                                                             h->value.len);
 
     dd("setting last-modified-time: %d",
-         (int) r->headers_out.last_modified_time);
+       (int) r->headers_out.last_modified_time);
 
     return NGX_OK;
 }

src/ngx_http_srcache_store.c

@@ -601,7 +601,7 @@ ngx_http_srcache_store_subrequest(ngx_http_request_t *r,
     dd("firing the store subrequest");
 
     dd("store location: %.*s", (int) parsed_sr->location.len,
-            parsed_sr->location.data);
+       parsed_sr->location.data);
 
     dd("store args: %.*s", (int) parsed_sr->args.len,
        parsed_sr->args.data);

src/ngx_http_srcache_util.c

@@ -144,9 +144,10 @@ ngx_http_srcache_discard_bufs(ngx_pool_t *pool, ngx_chain_t *in)
 ngx_int_t
 ngx_http_srcache_parse_method_name(ngx_str_t **method_name_ptr)
 {
-    const ngx_str_t* method_name = *method_name_ptr;
+    const ngx_str_t         *method_name = *method_name_ptr;
 
     switch (method_name->len) {
+
     case 3:
         if (ngx_http_srcache_strcmp_const(method_name->data, "GET") == 0) {
             *method_name_ptr = &ngx_http_srcache_get_method;
@@ -424,7 +425,7 @@ ngx_http_srcache_set_content_length_header(ngx_http_request_t *r, off_t len)
             'n'), 'g'), 't'), 'h');
 
     dd("r content length: %.*s",
-       (int)r->headers_in.content_length->value.len,
+       (int) r->headers_in.content_length->value.len,
        r->headers_in.content_length->value.data);
 
     pr = r->parent;
@@ -1069,7 +1070,7 @@ ngx_http_srcache_store_response_header(ngx_http_request_t *r,
 
         dd("header hash: %lu, hash lc: %lu", (unsigned long) header[i].hash,
            (unsigned long) ngx_hash_key_lc(header[i].key.data,
-           header[i].key.len));
+                                           header[i].key.len));
 
         if (ngx_hash_find(&conf->hide_headers_hash, header[i].hash,
                           header[i].lowcase_key, header[i].key.len))
@@ -1212,7 +1213,7 @@ ngx_http_srcache_hide_headers_hash(ngx_conf_t *cf,
             }
 
             dd("adding header to hide headers: %.*s", (int) h[i].len,
-                    h[i].data);
+               h[i].data);
 
         exist: