Skip to content

Commit bab709a

Browse files
agentzhagentzh
committed
massive coding style fixes.
1 parent fbc32b4 commit bab709a

File tree

2 files changed

+79
-69
lines changed

2 files changed

+79
-69
lines changed

‎src/ngx_http_array_var_module.c

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
1+
2+
/*
3+
* Copyright (C) Yichun Zhang (agentzh)
4+
*/
5+
6+
7+
#ifndef DDEBUG
18
#define DDEBUG 0
9+
#endif
210
#include "ddebug.h"
311

4-
#include "ngx_http_array_var_util.h"
512

13+
#include "ngx_http_array_var_util.h"
614
#include <ndk.h>
715

16+
817
static ngx_str_t ngx_http_array_it_key = ngx_string("array_it");
918

19+
1020
typedef struct {
1121
ngx_uint_t nargs;
12-
1322
} ngx_http_array_split_data_t;
1423

24+
1525
typedef struct {
16-
ngx_flag_t in_place;
26+
unsigned in_place;
1727
ngx_http_complex_value_t *template;
1828
ngx_int_t array_it_index;
19-
2029
} ngx_http_array_map_data_t;
2130

22-
typedef struct {
23-
ngx_flag_t in_place;
2431

32+
typedef struct {
33+
unsigned in_place;
2534
} ngx_http_array_map_op_data_t;
2635

2736

2837
static char * ngx_http_array_split(ngx_conf_t *cf, ngx_command_t *cmd,
29-
void *conf);
30-
38+
void *conf);
3139
static char * ngx_http_array_map(ngx_conf_t *cf, ngx_command_t *cmd,
32-
void *conf);
33-
40+
void *conf);
3441
static char * ngx_http_array_map_op(ngx_conf_t *cf, ngx_command_t *cmd,
35-
void *conf);
36-
42+
void *conf);
3743
static char * ngx_http_array_join(ngx_conf_t *cf, ngx_command_t *cmd,
38-
void *conf);
39-
44+
void *conf);
4045
static ngx_int_t ngx_http_array_var_split(ngx_http_request_t *r,
41-
ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
42-
46+
ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
4347
static ngx_int_t ngx_http_array_var_map(ngx_http_request_t *r,
44-
ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
45-
48+
ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
4649
static ngx_int_t ngx_http_array_var_map_op(ngx_http_request_t *r,
47-
ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
48-
50+
ngx_str_t *res, ngx_http_variable_value_t *v, void *data);
4951
static ngx_int_t ngx_http_array_var_join(ngx_http_request_t *r,
50-
ngx_str_t *res, ngx_http_variable_value_t *v);
52+
ngx_str_t *res, ngx_http_variable_value_t *v);
5153

5254

5355
static ngx_command_t ngx_http_array_var_commands[] = {
5456
{
5557
ngx_string ("array_split"),
5658
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
57-
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
59+
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_2MORE,
5860
ngx_http_array_split,
5961
0,
6062
0,
@@ -63,7 +65,8 @@ static ngx_command_t ngx_http_array_var_commands[] = {
6365
{
6466
ngx_string ("array_map"),
6567
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
66-
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE23,
68+
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
69+
|NGX_CONF_TAKE23,
6770
ngx_http_array_map,
6871
0,
6972
0,
@@ -72,7 +75,8 @@ static ngx_command_t ngx_http_array_var_commands[] = {
7275
{
7376
ngx_string ("array_map_op"),
7477
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
75-
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE23,
78+
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
79+
|NGX_CONF_TAKE23,
7680
ngx_http_array_map_op,
7781
0,
7882
0,
@@ -81,7 +85,8 @@ static ngx_command_t ngx_http_array_var_commands[] = {
8185
{
8286
ngx_string("array_join"),
8387
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF
84-
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE23,
88+
|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
89+
|NGX_CONF_TAKE23,
8590
ngx_http_array_join,
8691
0,
8792
0,
@@ -109,16 +114,16 @@ static ngx_http_module_t ngx_http_array_var_module_ctx = {
109114

110115
ngx_module_t ngx_http_array_var_module = {
111116
NGX_MODULE_V1,
112-
&ngx_http_array_var_module_ctx, // module context
113-
ngx_http_array_var_commands, // module directives
114-
NGX_HTTP_MODULE, // module type
115-
NULL, // init master
116-
NULL, // init module
117-
NULL, // init process
118-
NULL, // init thread
119-
NULL, // exit thread
120-
NULL, // exit process
121-
NULL, // exit master
117+
&ngx_http_array_var_module_ctx, /* module context */
118+
ngx_http_array_var_commands, /* module directives */
119+
NGX_HTTP_MODULE, /* module type */
120+
NULL, /* init master */
121+
NULL, /* init module */
122+
NULL, /* init process */
123+
NULL, /* init thread */
124+
NULL, /* exit thread */
125+
NULL, /* exit process */
126+
NULL, /* exit master */
122127
NGX_MODULE_V1_PADDING
123128
};
124129

@@ -414,22 +419,22 @@ ngx_http_array_join(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
414419

415420

416421
static ngx_int_t
417-
ngx_http_array_var_split(ngx_http_request_t *r,
418-
ngx_str_t *res, ngx_http_variable_value_t *v, void *data)
422+
ngx_http_array_var_split(ngx_http_request_t *r, ngx_str_t *res,
423+
ngx_http_variable_value_t *v, void *data)
419424
{
420425
ngx_http_array_split_data_t *conf = data;
421426
ngx_http_variable_value_t *sep, *str;
422427
ngx_str_t *s;
423428
u_char *pos, *end, *last;
424-
ssize_t max, i;
429+
ssize_t max, i, len = 4;
425430
ngx_array_t *array;
426431

427432
if (conf->nargs == 3) {
428433
max = ngx_atosz(v[2].data, v[2].len);
429434
if (max == NGX_ERROR) {
430435
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
431-
"array_split: invalid max items: \"%V\"",
432-
&v[2]);
436+
"array_split: invalid max items: \"%V\"",
437+
&v[2]);
433438

434439
return NGX_ERROR;
435440
}
@@ -438,13 +443,10 @@ ngx_http_array_var_split(ngx_http_request_t *r,
438443
}
439444

440445
if (max) {
441-
array = ngx_array_create(r->pool, max,
442-
sizeof(ngx_str_t));
443-
} else {
444-
array = ngx_array_create(r->pool, 4,
445-
sizeof(ngx_str_t));
446+
len = max;
446447
}
447448

449+
array = ngx_array_create(r->pool, len, sizeof(ngx_str_t));
448450
if (array == NULL) {
449451
return NGX_ERROR;
450452
}
@@ -521,8 +523,8 @@ ngx_http_array_var_split(ngx_http_request_t *r,
521523

522524

523525
static ngx_int_t
524-
ngx_http_array_var_map(ngx_http_request_t *r,
525-
ngx_str_t *res, ngx_http_variable_value_t *v, void *data)
526+
ngx_http_array_var_map(ngx_http_request_t *r, ngx_str_t *res,
527+
ngx_http_variable_value_t *v, void *data)
526528
{
527529
ngx_http_array_map_data_t *conf = data;
528530
ngx_http_variable_value_t *array_it;
@@ -540,8 +542,8 @@ ngx_http_array_var_map(ngx_http_request_t *r,
540542

541543
if (v[0].len != sizeof(ngx_array_t)) {
542544
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
543-
"array_join: invalid array variable value in the 2nd "
544-
"argument: \"%.*s\"", &v[0]);
545+
"array_join: invalid array variable value in the 2nd "
546+
"argument: \"%.*s\"", &v[0]);
545547

546548
return NGX_ERROR;
547549
}
@@ -554,9 +556,10 @@ ngx_http_array_var_map(ngx_http_request_t *r,
554556

555557
if ( conf->in_place) {
556558
new_array = array;
559+
557560
} else {
558561
new_array = ngx_array_create(r->pool, array->nelts,
559-
sizeof(ngx_str_t));
562+
sizeof(ngx_str_t));
560563
if (new_array == NULL) {
561564
return NGX_ERROR;
562565
}
@@ -602,7 +605,7 @@ ngx_http_array_var_map(ngx_http_request_t *r,
602605

603606
static ngx_int_t
604607
ngx_http_array_var_map_op(ngx_http_request_t *r,
605-
ngx_str_t *res, ngx_http_variable_value_t *v, void *data)
608+
ngx_str_t *res, ngx_http_variable_value_t *v, void *data)
606609
{
607610
ngx_http_variable_value_t arg;
608611
ngx_http_array_map_op_data_t *conf = data;
@@ -618,17 +621,17 @@ ngx_http_array_var_map_op(ngx_http_request_t *r,
618621

619622
if (func == NULL) {
620623
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
621-
"array_map_op: directive \"%v\" not found "
622-
"or does not use ndk_set_var_value",
623-
&v[0]);
624+
"array_map_op: directive \"%v\" not found "
625+
"or does not use ndk_set_var_value",
626+
&v[0]);
624627

625628
return NGX_ERROR;
626629
}
627630

628631
if (v[1].len != sizeof(ngx_array_t)) {
629632
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
630-
"array_map_op: invalid array variable value in the 2nd "
631-
"argument: \"%.*s\"", &v[0]);
633+
"array_map_op: invalid array variable value in the 2nd "
634+
"argument: \"%.*s\"", &v[0]);
632635

633636
return NGX_ERROR;
634637
}
@@ -642,7 +645,7 @@ ngx_http_array_var_map_op(ngx_http_request_t *r,
642645

643646
} else {
644647
new_array = ngx_array_create(r->pool, array->nelts,
645-
sizeof(ngx_str_t));
648+
sizeof(ngx_str_t));
646649
if (new_array == NULL) {
647650
return NGX_ERROR;
648651
}
@@ -679,7 +682,7 @@ ngx_http_array_var_map_op(ngx_http_request_t *r,
679682

680683
static ngx_int_t
681684
ngx_http_array_var_join(ngx_http_request_t *r,
682-
ngx_str_t *res, ngx_http_variable_value_t *v)
685+
ngx_str_t *res, ngx_http_variable_value_t *v)
683686
{
684687
ngx_http_variable_value_t *sep;
685688
ngx_array_t *array;
@@ -694,8 +697,8 @@ ngx_http_array_var_join(ngx_http_request_t *r,
694697

695698
if (v[1].len != sizeof(ngx_array_t)) {
696699
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
697-
"array_join: invalid array variable value in the "
698-
"2nd argument: \"%V\"", &v[1]);
700+
"array_join: invalid array variable value in the "
701+
"2nd argument: \"%V\"", &v[1]);
699702

700703
return NGX_ERROR;
701704
}
@@ -740,11 +743,10 @@ ngx_http_array_var_join(ngx_http_request_t *r,
740743

741744
if (p != res->data + res->len) {
742745
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
743-
"array_join: buffer error");
746+
"array_join: buffer error");
744747

745748
return NGX_ERROR;
746749
}
747750

748751
return NGX_OK;
749752
}
750-

‎src/ngx_http_array_var_util.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1+
2+
/*
3+
* Copyright (C) Yichun Zhang (agentzh)
4+
*/
5+
6+
7+
#ifndef DDEBUG
18
#define DDEBUG 0
9+
#endif
210
#include "ddebug.h"
311

12+
413
#include "ngx_http_array_var_util.h"
514

615

716
static ngx_int_t ngx_http_array_var_variable_not_found(ngx_http_request_t *r,
8-
ngx_http_variable_value_t *v, uintptr_t data);
17+
ngx_http_variable_value_t *v, uintptr_t data);
918

1019

1120
/* Modified from the ngx_strlcasestrn function in ngx_string.h
@@ -35,8 +44,7 @@ ngx_http_array_var_strlstrn(u_char *s1, u_char *last, u_char *s2, size_t n)
3544

3645

3746
ndk_set_var_value_pt
38-
ngx_http_array_var_get_func_from_cmd(u_char *name,
39-
size_t name_len)
47+
ngx_http_array_var_get_func_from_cmd(u_char *name, size_t name_len)
4048
{
4149
ndk_set_var_t *filter;
4250
ngx_uint_t i;
@@ -65,7 +73,7 @@ ngx_http_array_var_get_func_from_cmd(u_char *name,
6573
}
6674

6775
if (cmd->name.len != name_len
68-
|| ngx_strncmp(cmd->name.data, name, name_len) != 0)
76+
|| ngx_strncmp(cmd->name.data, name, name_len) != 0)
6977
{
7078
continue;
7179
}
@@ -79,7 +87,8 @@ ngx_http_array_var_get_func_from_cmd(u_char *name,
7987

8088

8189
ngx_int_t
82-
ngx_http_array_var_add_variable(ngx_conf_t *cf, ngx_str_t *name) {
90+
ngx_http_array_var_add_variable(ngx_conf_t *cf, ngx_str_t *name)
91+
{
8392
ngx_http_variable_t *v;
8493

8594
v = ngx_http_add_variable(cf, name, NGX_HTTP_VAR_CHANGEABLE);
@@ -95,9 +104,8 @@ ngx_http_array_var_add_variable(ngx_conf_t *cf, ngx_str_t *name) {
95104

96105
static ngx_int_t
97106
ngx_http_array_var_variable_not_found(ngx_http_request_t *r,
98-
ngx_http_variable_value_t *v, uintptr_t data)
107+
ngx_http_variable_value_t *v, uintptr_t data)
99108
{
100109
v->not_found = 1;
101110
return NGX_OK;
102111
}
103-

0 commit comments

Comments
 (0)