Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6b10a63

Browse files
committed
style: fixed minor coding style issues found by ngx-releng.
1 parent 0cde4c7 commit 6b10a63

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

‎src/ngx_http_rds_json_filter_module.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,7 @@ ngx_http_rds_json_ret(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
535535

536536
done:
537537

538-
clcf = ngx_http_conf_get_module_loc_conf(cf,
539-
ngx_http_core_module);
538+
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
540539
if (clcf == NULL) {
541540
return NGX_CONF_ERROR;
542541
}

‎src/ngx_http_rds_json_handler.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
2424

2525
dd("entered ret handler");
2626

27-
conf = ngx_http_get_module_loc_conf(r,
28-
ngx_http_rds_json_filter_module);
27+
conf = ngx_http_get_module_loc_conf(r, ngx_http_rds_json_filter_module);
2928

3029
/* evaluate the final value of conf->errstr */
3130

@@ -43,8 +42,8 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
4342
;
4443

4544
if (errstr.len) {
46-
escape = ngx_http_rds_json_escape_json_str(NULL,
47-
errstr.data, errstr.len);
45+
escape = ngx_http_rds_json_escape_json_str(NULL,errstr.data,
46+
errstr.len);
4847

4948
len += sizeof(",") - 1
5049
+ conf->errstr_key.len
@@ -58,6 +57,7 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
5857

5958
if (conf->success.len) {
6059
len += conf->success.len + sizeof(":,") - 1;
60+
6161
if (ngx_atoi(conf->errcode.data, conf->errcode.len) == 0) {
6262
len += sizeof("true") - 1;
6363

@@ -68,15 +68,15 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
6868

6969
if (conf->user_props) {
7070
values = ngx_pnalloc(r->pool,
71-
conf->user_props->nelts* (sizeof(ngx_str_t) +
72-
sizeof(uintptr_t)));
71+
conf->user_props->nelts
72+
* (sizeof(ngx_str_t) +sizeof(uintptr_t)));
7373

7474
if (values == NULL) {
7575
return NGX_ERROR;
7676
}
7777

7878
escapes = (uintptr_t *) ((u_char *) values +
79-
conf->user_props->nelts * sizeof(ngx_str_t));
79+
conf->user_props->nelts * sizeof(ngx_str_t));
8080

8181
prop = conf->user_props->elts;
8282
for (i = 0; i < conf->user_props->nelts; i++) {
@@ -87,7 +87,7 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
8787
}
8888

8989
escapes[i] = ngx_http_rds_json_escape_json_str(NULL, values[i].data,
90-
values[i].len);
90+
values[i].len);
9191

9292
len += sizeof(":\"\",") - 1 + prop[i].key.len + values[i].len
9393
+ escapes[i];
@@ -124,8 +124,8 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
124124

125125
if (errstr.len) {
126126
*b->last++ = ',';
127-
b->last = ngx_copy(b->last,
128-
conf->errstr_key.data, conf->errstr_key.len);
127+
b->last = ngx_copy(b->last,conf->errstr_key.data,
128+
conf->errstr_key.len);
129129
*b->last++ = ':';
130130
*b->last++ = '"';
131131

@@ -174,7 +174,7 @@ ngx_http_rds_json_ret_handler(ngx_http_request_t *r)
174174

175175
if (b->last != b->end) {
176176
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
177-
"rds_json: rds_json_ret: buffer error");
177+
"rds_json: rds_json_ret: buffer error");
178178

179179
return NGX_ERROR;
180180
}

‎src/ngx_http_rds_json_output.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ ngx_http_rds_json_output_header(ngx_http_request_t *r,
152152

153153
if (conf->user_props) {
154154
values = ngx_pnalloc(r->pool,
155-
conf->user_props->nelts* (sizeof(ngx_str_t)
156-
+ sizeof(uintptr_t)));
155+
conf->user_props->nelts
156+
* (sizeof(ngx_str_t) + sizeof(uintptr_t)));
157157

158158
if (values == NULL) {
159159
return NGX_ERROR;
160160
}
161161

162162
escapes = (uintptr_t *) ((u_char *) values
163-
+ conf->user_props->nelts * sizeof(ngx_str_t));
163+
+ conf->user_props->nelts * sizeof(ngx_str_t));
164164

165165
prop = conf->user_props->elts;
166166
for (i = 0; i < conf->user_props->nelts; i++) {
@@ -327,15 +327,16 @@ ngx_http_rds_json_output_props(ngx_http_request_t *r,
327327

328328
if (conf->user_props) {
329329
values = ngx_pnalloc(r->pool,
330-
conf->user_props->nelts* (sizeof(ngx_str_t)
331-
+ sizeof(uintptr_t)));
330+
conf->user_props->nelts
331+
* (sizeof(ngx_str_t) + sizeof(uintptr_t)));
332332

333333
if (values == NULL) {
334334
return NGX_ERROR;
335335
}
336336

337337
escapes = (uintptr_t *) ((u_char *) values
338-
+ conf->user_props->nelts * sizeof(ngx_str_t));
338+
+ conf->user_props->nelts
339+
* sizeof(ngx_str_t));
339340

340341
prop = conf->user_props->elts;
341342
for (i = 0; i < conf->user_props->nelts; i++) {
@@ -873,14 +874,14 @@ ngx_http_rds_json_output_more_field_data(ngx_http_request_t *r,
873874

874875
} else {
875876
dd("more field data: string value escape non-zero: %d",
876-
(int) escape);
877+
(int) escape);
877878

878879
#if DDEBUG
879880
p = last;
880881
#endif
881882

882883
last = (u_char *) ngx_http_rds_json_escape_json_str(last,
883-
data, len);
884+
data, len);
884885

885886
#if DDEBUG
886887
dd("escaped value \"%.*s\" (len %d, escape %d, escape2 %d)",

‎src/ngx_http_rds_json_util.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ ngx_http_rds_json_discard_bufs(ngx_pool_t *pool, ngx_chain_t *in)
145145
for (cl = in; cl; cl = cl->next) {
146146
#if 0
147147
if (cl->buf->temporary
148-
&& ngx_buf_size(cl->buf) > 0) {
148+
&& ngx_buf_size(cl->buf) > 0)
149+
{
149150
ngx_pfree(pool, cl->buf->start);
150151
}
151152
#endif

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /