Skip to content

Commit d35ee18

Browse files
committed
refactor: update variable types and function signatures for consistency
1 parent 5fa4089 commit d35ee18

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

src/ngx_http_vhost_traffic_status_display_json.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ ngx_http_vhost_traffic_status_display_set_server_node(
5858
ngx_http_vhost_traffic_status_node_t *vtsn)
5959
{
6060
u_char *p, *c;
61-
ngx_int_t rc, i;
61+
ngx_int_t rc;
62+
ngx_uint_t i;
6263
ngx_str_t tmp, dst;
63-
ngx_uint_t *status_codes
64+
ngx_uint_t *status_codes;
6465
ngx_http_vhost_traffic_status_loc_conf_t *vtscf;
6566
ngx_http_vhost_traffic_status_ctx_t *ctx;
6667

@@ -107,7 +108,7 @@ ngx_http_vhost_traffic_status_display_set_server_node(
107108
buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_SERVER_OTHER_STATUS_CODE,
108109
vtsn->stat_status_code_counter[0]);
109110

110-
*status_codes = (ngx_uint_t *) ctx->measure_status_codes->elts;
111+
status_codes = (ngx_uint_t *) ctx->measure_status_codes->elts;
111112

112113
for (i = 0; i < ctx->measure_status_codes->nelts; i++) {
113114
if (vtsn->stat_status_code_counter[i+1] == 0 && ctx->measure_all_status_codes) {

src/ngx_http_vhost_traffic_status_node.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ ngx_http_vhost_traffic_status_node_lookup(ngx_rbtree_t *rbtree, ngx_str_t *key,
267267
void
268268
ngx_http_vhost_traffic_status_node_zero(ngx_http_vhost_traffic_status_node_t *vtsn)
269269
{
270+
ngx_uint_t i;
271+
270272
vtsn->stat_request_counter = 0;
271273
vtsn->stat_in_bytes = 0;
272274
vtsn->stat_out_bytes = 0;

src/ngx_http_vhost_traffic_status_shm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,8 @@ ngx_http_vhost_traffic_status_shm_add_upstream(ngx_http_request_t *r)
560560
return NGX_OK;
561561
}
562562

563-
static int ngx_http_vhost_traffic_status_find_status_code_slot_cmp(const void *one, const void *two)
563+
static int
564+
ngx_http_vhost_traffic_status_find_status_code_slot_cmp(const void *one, const void *two)
564565
{
565566
return (*(ngx_uint_t *) one - *(ngx_uint_t *) two);
566567
}

src/ngx_http_vhost_traffic_status_shm.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ typedef struct {
1717
ngx_uint_t filter_used_size;
1818
ngx_uint_t filter_used_node;
1919
} ngx_http_vhost_traffic_status_shm_info_t;
20-
2120
ngx_int_t ngx_http_vhost_traffic_status_shm_add_server(ngx_http_request_t *r);
2221
ngx_int_t ngx_http_vhost_traffic_status_shm_add_filter(ngx_http_request_t *r);
2322
ngx_int_t ngx_http_vhost_traffic_status_shm_add_upstream(ngx_http_request_t *r);
24-
ngx_int_t ngx_http_vhost_traffic_status_find_status_code_slot(ngx_uint_t status, ngx_array_t *status_codes);
23+
ngx_uint_t ngx_http_vhost_traffic_status_find_status_code_slot(ngx_uint_t status, ngx_array_t *status_codes);
2524

2625
#if (NGX_HTTP_CACHE)
2726
ngx_int_t ngx_http_vhost_traffic_status_shm_add_cache(ngx_http_request_t *r);

0 commit comments

Comments
 (0)