Skip to content

Commit a3ac3f5

Browse files
thibaultchathibaultcha
committed
style: updated 'nginx_version' guard macros assuming it is always defined.
No need to check if `nginx_version` is defined, as of NGINX 1.6.0+ (today's minimum supported core version), always is.
1 parent 771eb23 commit a3ac3f5

16 files changed

+32
-32
lines changed

‎src/ngx_http_lua_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ ngx_http_lua_shared_memory_init(ngx_shm_zone_t *shm_zone, void *data)
175175
}
176176

177177
zone->shm = shm_zone->shm;
178-
#if defined(nginx_version) && nginx_version >= 1009000
178+
#if (nginx_version >= 1009000)
179179
zone->noreuse = shm_zone->noreuse;
180180
#endif
181181

‎src/ngx_http_lua_common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ typedef struct {
5252
#endif
5353

5454

55-
#if !defined(nginx_version) || (nginx_version < 1006000)
55+
#if (nginx_version < 1006000)
5656
# error at least nginx 1.6.0 is required but found an older version
5757
#endif
5858

@@ -74,7 +74,7 @@ typedef struct {
7474
#endif
7575

7676
#ifndef NGX_HAVE_SHA1
77-
# if defined(nginx_version) && (nginx_version >= 1011002)
77+
# if (nginx_version >= 1011002)
7878
# define NGX_HAVE_SHA1 1
7979
# endif
8080
#endif
@@ -251,7 +251,7 @@ struct ngx_http_lua_main_conf_s {
251251
of reqeusts */
252252
ngx_uint_t malloc_trim_req_count;
253253

254-
#if defined(nginx_version) && (nginx_version >= 1011011)
254+
#if (nginx_version >= 1011011)
255255
/* the following 2 fields are only used by ngx.req.raw_headers() for now */
256256
ngx_buf_t **busy_buf_ptrs;
257257
ngx_int_t busy_buf_ptr_count;

‎src/ngx_http_lua_directive.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,12 +1433,12 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
14331433
ngx_uint_t start_line;
14341434
ngx_str_t *word;
14351435
ngx_buf_t *b;
1436-
#if defined(nginx_version) && (nginx_version >= 1009002)
1436+
#if (nginx_version >= 1009002)
14371437
ngx_buf_t *dump;
14381438
#endif
14391439

14401440
b = cf->conf_file->buffer;
1441-
#if defined(nginx_version) && (nginx_version >= 1009002)
1441+
#if (nginx_version >= 1009002)
14421442
dump = cf->conf_file->dump;
14431443
#endif
14441444
start = b->pos;
@@ -1509,7 +1509,7 @@ ngx_http_lua_conf_read_lua_token(ngx_conf_t *cf,
15091509
b->last = b->start + len + n;
15101510
start = b->start;
15111511

1512-
#if defined(nginx_version) && (nginx_version >= 1009002)
1512+
#if (nginx_version >= 1009002)
15131513
if (dump) {
15141514
dump->last = ngx_cpymem(dump->last, b->start + len, size);
15151515
}

‎src/ngx_http_lua_headers.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static int ngx_http_lua_ngx_req_raw_header(lua_State *L);
2222
static int ngx_http_lua_ngx_req_header_set_helper(lua_State *L);
2323
static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
2424
static int ngx_http_lua_ngx_req_header_set(lua_State *L);
25-
#if defined(nginx_version) && (nginx_version >= 1011011)
25+
#if (nginx_version >= 1011011)
2626
void ngx_http_lua_ngx_raw_header_cleanup(void *data);
2727
#endif
2828

@@ -102,7 +102,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
102102
size_t size;
103103
ngx_buf_t *b, *first = NULL;
104104
ngx_int_t i, j;
105-
#if defined(nginx_version) && (nginx_version >= 1011011)
105+
#if (nginx_version >= 1011011)
106106
ngx_buf_t **bb;
107107
ngx_chain_t *cl;
108108
ngx_http_lua_main_conf_t *lmcf;
@@ -123,7 +123,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
123123
return luaL_error(L, "no request object found");
124124
}
125125

126-
#if defined(nginx_version) && (nginx_version >= 1011011)
126+
#if (nginx_version >= 1011011)
127127
lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
128128
#endif
129129

@@ -143,7 +143,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
143143
dd("hc->nbusy: %d", (int) hc->nbusy);
144144

145145
if (hc->nbusy) {
146-
#if defined(nginx_version) && (nginx_version >= 1011011)
146+
#if (nginx_version >= 1011011)
147147
dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
148148
hc->busy->buf->last, hc->busy->buf->end);
149149
#else
@@ -185,7 +185,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
185185
dd("size: %d", (int) size);
186186

187187
if (hc->nbusy) {
188-
#if defined(nginx_version) && (nginx_version >= 1011011)
188+
#if (nginx_version >= 1011011)
189189
if (hc->nbusy > lmcf->busy_buf_ptr_count) {
190190
if (lmcf->busy_buf_ptrs) {
191191
ngx_free(lmcf->busy_buf_ptrs);
@@ -208,7 +208,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
208208
#endif
209209
b = NULL;
210210

211-
#if defined(nginx_version) && (nginx_version >= 1011011)
211+
#if (nginx_version >= 1011011)
212212
bb = lmcf->busy_buf_ptrs;
213213
for (i = hc->nbusy; i > 0; i--) {
214214
b = bb[i - 1];
@@ -291,7 +291,7 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
291291

292292
if (hc->nbusy) {
293293

294-
#if defined(nginx_version) && (nginx_version >= 1011011)
294+
#if (nginx_version >= 1011011)
295295
bb = lmcf->busy_buf_ptrs;
296296
for (i = hc->nbusy - 1; i >= 0; i--) {
297297
b = bb[i];
@@ -1138,7 +1138,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
11381138
}
11391139

11401140

1141-
#if defined(nginx_version) && (nginx_version >= 1011011)
1141+
#if (nginx_version >= 1011011)
11421142
void
11431143
ngx_http_lua_ngx_raw_header_cleanup(void *data)
11441144
{

‎src/ngx_http_lua_headers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
void ngx_http_lua_inject_resp_header_api(lua_State *L);
1616
void ngx_http_lua_inject_req_header_api(lua_State *L);
1717
void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L);
18-
#if defined(nginx_version) && (nginx_version >= 1011011)
18+
#if (nginx_version >= 1011011)
1919
void ngx_http_lua_ngx_raw_header_cleanup(void *data);
2020
#endif
2121

‎src/ngx_http_lua_headers_out.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static ngx_http_lua_set_header_t ngx_http_lua_set_handlers[] = {
106106
offsetof(ngx_http_headers_out_t, cache_control),
107107
ngx_http_set_builtin_multi_header },
108108

109-
#if defined(nginx_version) && nginx_version >= 1013009
109+
#if (nginx_version >= 1013009)
110110
{ ngx_string("Link"),
111111
offsetof(ngx_http_headers_out_t, link),
112112
ngx_http_set_builtin_multi_header },

‎src/ngx_http_lua_initworkerby.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
194194
return NGX_ERROR;
195195
}
196196

197-
#if defined(nginx_version) && nginx_version >= 1009011
197+
#if (nginx_version >= 1009011)
198198
modules = cycle->modules;
199199
#else
200200
modules = ngx_modules;
@@ -294,7 +294,7 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
294294

295295
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
296296

297-
#if defined(nginx_version) && (nginx_version >= 1009000)
297+
#if (nginx_version >= 1009000)
298298
ngx_set_connection_log(r->connection, clcf->error_log);
299299

300300
#else

‎src/ngx_http_lua_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
748748
ngx_http_lua_pipe_init();
749749
#endif
750750

751-
#if defined(nginx_version) && (nginx_version >= 1011011)
751+
#if (nginx_version >= 1011011)
752752
cln = ngx_pool_cleanup_add(cf->pool, 0);
753753
if (cln == NULL) {
754754
return NGX_ERROR;

‎src/ngx_http_lua_ndk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ngx_http_lookup_ndk_set_var_directive(u_char *name,
4646
ngx_module_t **modules;
4747
ngx_command_t *cmd;
4848

49-
#if defined(nginx_version) && nginx_version >= 1009011
49+
#if (nginx_version >= 1009011)
5050
modules = ngx_cycle->modules;
5151
#else
5252
modules = ngx_modules;

‎src/ngx_http_lua_shdict.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,7 @@ ngx_http_lua_ffi_shdict_capacity(ngx_shm_zone_t *zone)
20792079
}
20802080

20812081

2082-
# if nginx_version >= 1011007
2082+
#if (nginx_version >= 1011007)
20832083
size_t
20842084
ngx_http_lua_ffi_shdict_free_space(ngx_shm_zone_t *zone)
20852085
{
@@ -2094,7 +2094,7 @@ ngx_http_lua_ffi_shdict_free_space(ngx_shm_zone_t *zone)
20942094

20952095
return bytes;
20962096
}
2097-
# endif /* nginx_version >= 1011007 */
2097+
#endif
20982098

20992099

21002100
/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

‎src/ngx_http_lua_socket_tcp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ ngx_http_lua_ssl_handshake_handler(ngx_connection_t *c)
18391839
goto failed;
18401840
}
18411841

1842-
#if defined(nginx_version) && nginx_version >= 1007000
1842+
#if (nginx_version >= 1007000)
18431843

18441844
if (u->ssl_name.len
18451845
&& ngx_ssl_check_host(c, &u->ssl_name) != NGX_OK)
@@ -3758,7 +3758,7 @@ ngx_http_lua_socket_tcp_finalize_read_part(ngx_http_request_t *r,
37583758
ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
37593759
}
37603760

3761-
#if defined(nginx_version) && nginx_version >= 1007005
3761+
#if (nginx_version >= 1007005)
37623762
if (c->read->posted) {
37633763
#else
37643764
if (c->read->prev) {
@@ -3811,7 +3811,7 @@ ngx_http_lua_socket_tcp_finalize_write_part(ngx_http_request_t *r,
38113811
ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
38123812
}
38133813

3814-
#if defined(nginx_version) && nginx_version >= 1007005
3814+
#if (nginx_version >= 1007005)
38153815
if (c->write->posted) {
38163816
#else
38173817
if (c->write->prev) {

‎src/ngx_http_lua_ssl_certby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ ngx_http_lua_ssl_cert_handler(ngx_ssl_conn_t *ssl_conn, void *data)
245245

246246
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
247247

248-
#if defined(nginx_version) && (nginx_version >= 1009000)
248+
#if (nginx_version >= 1009000)
249249
ngx_set_connection_log(fc, clcf->error_log);
250250

251251
#else

‎src/ngx_http_lua_ssl_session_fetchby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ ngx_http_lua_ssl_sess_fetch_handler(ngx_ssl_conn_t *ssl_conn,
267267

268268
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
269269

270-
#if defined(nginx_version) && (nginx_version >= 1009000)
270+
#if (nginx_version >= 1009000)
271271
ngx_set_connection_log(fc, clcf->error_log);
272272

273273
#else

‎src/ngx_http_lua_ssl_session_storeby.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ ngx_http_lua_ssl_sess_store_handler(ngx_ssl_conn_t *ssl_conn,
229229

230230
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
231231

232-
#if defined(nginx_version) && (nginx_version >= 1009000)
232+
#if (nginx_version >= 1009000)
233233
ngx_set_connection_log(fc, clcf->error_log);
234234

235235
#else

‎src/ngx_http_lua_subrequest.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
14591459
ngx_http_request_t *sr;
14601460
ngx_http_core_srv_conf_t *cscf;
14611461

1462-
#if defined(nginx_version) && (nginx_version >= 1009005)
1462+
#if (nginx_version >= 1009005)
14631463

14641464
if (r->subrequests == 0) {
14651465
#if defined(NGX_DTRACE) && NGX_DTRACE
@@ -1578,7 +1578,7 @@ ngx_http_lua_subrequest(ngx_http_request_t *r,
15781578

15791579
sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1;
15801580

1581-
#if defined(nginx_version) && (nginx_version >= 1009005)
1581+
#if (nginx_version >= 1009005)
15821582
sr->subrequests = r->subrequests - 1;
15831583
#endif
15841584

‎src/ngx_http_lua_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ ngx_http_lua_timer_handler(ngx_event_t *ev)
622622

623623
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
624624

625-
#if defined(nginx_version) && (nginx_version >= 1009000)
625+
#if (nginx_version >= 1009000)
626626
ngx_set_connection_log(r->connection, clcf->error_log);
627627

628628
#else

0 commit comments

Comments
 (0)