Skip to content

Commit 8a722e8

Browse files
author
Felipe Zimmerle
committed
nginx: cosmetics: Splits lines longer than 80 characters
1 parent b405850 commit 8a722e8

File tree

5 files changed

+117
-59
lines changed

5 files changed

+117
-59
lines changed

nginx/modsecurity/apr_bucket_nginx.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ static apr_status_t nginx_bucket_read(apr_bucket *b, const char **str,
6262
return APR_EGENERAL;
6363
}
6464

65-
size = ngx_read_file(buf->file, data, ngx_buf_size(buf), buf->file_pos);
65+
size = ngx_read_file(buf->file, data, ngx_buf_size(buf),
66+
buf->file_pos);
67+
6668
if (size != ngx_buf_size(buf)) {
6769
apr_bucket_free(data);
6870
return APR_EGENERAL;
@@ -153,8 +155,9 @@ ngx_buf_t * apr_bucket_to_ngx_buf(apr_bucket *e, ngx_pool_t *pool) {
153155
return buf;
154156
}
155157

156-
ngx_int_t
157-
copy_chain_to_brigade(ngx_chain_t *chain_orig, apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf) {
158+
ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig,
159+
apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf)
160+
{
158161
apr_bucket *e;
159162

160163
ngx_chain_t *chain = chain_orig;
@@ -183,8 +186,9 @@ copy_chain_to_brigade(ngx_chain_t *chain_orig, apr_bucket_brigade *bb, ngx_pool_
183186
}
184187

185188

186-
ngx_int_t
187-
move_chain_to_brigade(ngx_chain_t *chain_orig, apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf) {
189+
ngx_int_t move_chain_to_brigade(ngx_chain_t *chain_orig,
190+
apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf)
191+
{
188192
apr_bucket *e;
189193
ngx_chain_t *cl;
190194

@@ -215,8 +219,9 @@ move_chain_to_brigade(ngx_chain_t *chain_orig, apr_bucket_brigade *bb, ngx_pool_
215219
return NGX_AGAIN;
216220
}
217221

218-
ngx_int_t
219-
move_brigade_to_chain(apr_bucket_brigade *bb, ngx_chain_t **ll, ngx_pool_t *pool) {
222+
ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb,
223+
ngx_chain_t **ll, ngx_pool_t *pool)
224+
{
220225
apr_bucket *e;
221226
ngx_buf_t *buf;
222227
ngx_chain_t *cl;

nginx/modsecurity/apr_bucket_nginx.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ ngx_buf_t * apr_bucket_to_ngx_buf(apr_bucket *e, ngx_pool_t *pool);
1616
ngx_int_t copy_chain_to_brigade(ngx_chain_t *chain_orig,
1717
apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf);
1818

19-
ngx_int_t move_chain_to_brigade(ngx_chain_t *chain, apr_bucket_brigade *bb, ngx_pool_t *pool, ngx_int_t last_buf);
20-
ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb, ngx_chain_t **chain, ngx_pool_t *pool);
19+
ngx_int_t move_chain_to_brigade(ngx_chain_t *chain, apr_bucket_brigade *bb,
20+
ngx_pool_t *pool, ngx_int_t last_buf);
21+
22+
ngx_int_t move_brigade_to_chain(apr_bucket_brigade *bb, ngx_chain_t **chain,
23+
ngx_pool_t *pool);
2124

0 commit comments

Comments
 (0)