Skip to content

Commit 8bea65e

Browse files
wpjunioru5surf
andcommitted
Apply suggestions from code review
Co-authored-by: Y.Horie <u5.horie@gmail.com>
1 parent d791d36 commit 8bea65e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
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
@@ -68,8 +68,9 @@ ngx_http_vhost_traffic_status_display_set_server_node(
6868
ngx_http_vhost_traffic_status_node_t *vtsn)
6969
{
7070
u_char *p, *c;
71-
ngx_int_t rc;
71+
ngx_int_t rc, i;
7272
ngx_str_t tmp, dst;
73+
ngx_uint_t *status_codes
7374
ngx_http_vhost_traffic_status_loc_conf_t *vtscf;
7475
ngx_http_vhost_traffic_status_ctx_t *ctx;
7576

@@ -116,9 +117,9 @@ ngx_http_vhost_traffic_status_display_set_server_node(
116117
buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_SERVER_OTHER_STATUS_CODE,
117118
vtsn->stat_status_code_counter[0]);
118119

119-
ngx_uint_t *status_codes = (ngx_uint_t *) ctx->measure_status_codes->elts;
120+
*status_codes = (ngx_uint_t *) ctx->measure_status_codes->elts;
120121

121-
for (ngx_uint_t i = 0; i < ctx->measure_status_codes->nelts; i++) {
122+
for (i = 0; i < ctx->measure_status_codes->nelts; i++) {
122123
if (vtsn->stat_status_code_counter[i+1] == 0 && ctx->measure_all_status_codes) {
123124
continue;
124125
}

src/ngx_http_vhost_traffic_status_display_prometheus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ngx_http_vhost_traffic_status_display_prometheus_set_server_node(
8484
buf = ngx_sprintf(buf, NGX_HTTP_VHOST_TRAFFIC_STATUS_PROMETHEUS_FMT_SERVER_OTHER_STATUS_CODE,
8585
&server, vtsn->stat_status_code_counter[0]);
8686

87-
for (ngx_uint_t i = 0; i < ctx->measure_status_codes->nelts; i++) {
87+
for (i = 0; i < ctx->measure_status_codes->nelts; i++) {
8888
if (vtsn->stat_status_code_counter[i+1] == 0 && ctx->measure_all_status_codes) {
8989
continue;
9090
}

src/ngx_http_vhost_traffic_status_node.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ ngx_http_vhost_traffic_status_node_zero(ngx_http_vhost_traffic_status_node_t *vt
292292
vtsn->stat_request_time_counter_oc = 0;
293293
vtsn->stat_response_time_counter_oc = 0;
294294

295-
for (uint i=0; i<vtsn->stat_status_code_length; i++) {
295+
for (i = 0; i < vtsn->stat_status_code_length; i++) {
296296
vtsn->stat_status_code_counter[i] = 0;
297297
}
298298

src/ngx_http_vhost_traffic_status_shm.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ static int ngx_http_vhost_traffic_status_find_status_code_slot_cmp(const void *o
565565
return (*(ngx_uint_t *) one - *(ngx_uint_t *) two);
566566
}
567567

568-
ngx_int_t
568+
ngx_uint_t
569569
ngx_http_vhost_traffic_status_find_status_code_slot(ngx_uint_t status, ngx_array_t *status_codes)
570570
{
571571
ngx_uint_t *found = (ngx_uint_t *) bsearch(&status, status_codes->elts, status_codes->nelts,
@@ -578,8 +578,7 @@ ngx_http_vhost_traffic_status_find_status_code_slot(ngx_uint_t status, ngx_array
578578
return 0;
579579
}
580580

581-
ngx_int_t index = (ngx_int_t)(found - (ngx_uint_t *)status_codes->elts);
582-
return index + 1;
581+
return found - (ngx_uint_t *)status_codes->elts + 1;
583582
}
584583

585584
#if (NGX_HTTP_CACHE)

0 commit comments

Comments
 (0)