Skip to content

Commit ba182dd

Browse files
committed
style: fixed some minor styling issues to align with the meta_lua module.
1 parent eed28fc commit ba182dd

8 files changed

+34
-32
lines changed

src/ddebug.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
# if (NGX_HAVE_VARIADIC_MACROS)
1919

20-
# define dd(...) fprintf(stderr, "lua *** %s: ", __func__); \
21-
fprintf(stderr, __VA_ARGS__); \
20+
# define dd(...) fprintf(stderr, "lua *** %s: ", __func__); \
21+
fprintf(stderr, __VA_ARGS__); \
2222
fprintf(stderr, " at %s line %d.\n", __FILE__, __LINE__)
2323

2424
# else
@@ -54,22 +54,22 @@ dd(const char *fmt, ...) {
5454

5555
#if defined(DDEBUG) && (DDEBUG)
5656

57-
#define dd_check_read_event_handler(r) \
58-
dd("r->read_event_handler = %s", \
59-
r->read_event_handler == ngx_http_block_reading ? \
60-
"ngx_http_block_reading" : \
61-
r->read_event_handler == ngx_http_test_reading ? \
62-
"ngx_http_test_reading" : \
63-
r->read_event_handler == ngx_http_request_empty_handler ? \
57+
#define dd_check_read_event_handler(r) \
58+
dd("r->read_event_handler = %s", \
59+
r->read_event_handler == ngx_http_block_reading ? \
60+
"ngx_http_block_reading" : \
61+
r->read_event_handler == ngx_http_test_reading ? \
62+
"ngx_http_test_reading" : \
63+
r->read_event_handler == ngx_http_request_empty_handler ? \
6464
"ngx_http_request_empty_handler" : "UNKNOWN")
6565

66-
#define dd_check_write_event_handler(r) \
67-
dd("r->write_event_handler = %s", \
68-
r->write_event_handler == ngx_http_handler ? \
69-
"ngx_http_handler" : \
70-
r->write_event_handler == ngx_http_core_run_phases ? \
71-
"ngx_http_core_run_phases" : \
72-
r->write_event_handler == ngx_http_request_empty_handler ? \
66+
#define dd_check_write_event_handler(r) \
67+
dd("r->write_event_handler = %s", \
68+
r->write_event_handler == ngx_http_handler ? \
69+
"ngx_http_handler" : \
70+
r->write_event_handler == ngx_http_core_run_phases ? \
71+
"ngx_http_core_run_phases" : \
72+
r->write_event_handler == ngx_http_request_empty_handler ? \
7373
"ngx_http_request_empty_handler" : "UNKNOWN")
7474

7575
#else

src/ngx_http_lua_clfactory.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -380,12 +380,12 @@ ngx_http_lua_clfactory_bytecode_prepare(lua_State *L,
380380

381381
#if defined(DDEBUG) && (DDEBUG)
382382
{
383-
dd("==LJ_BT_HEADER==");
384-
size_t i;
385-
for (i = 0; i < LJ_HEADERSIZE; i++) {
386-
dd("%ld: 0x%02X", i, (unsigned)(u_char) lf->begin_code.str[i]);
387-
}
388-
dd("==LJ_BT_HEADER_END==");
383+
dd("==LJ_BT_HEADER==");
384+
size_t i;
385+
for (i = 0; i < LJ_HEADERSIZE; i++) {
386+
dd("%ld: 0x%02X", i, (unsigned)(u_char) lf->begin_code.str[i]);
387+
}
388+
dd("==LJ_BT_HEADER_END==");
389389
}
390390
#endif
391391

src/ngx_http_lua_common.h

-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,6 @@ typedef struct {
628628
ngx_str_t name;
629629
ngx_uint_t offset;
630630
ngx_http_lua_set_header_pt handler;
631-
632631
} ngx_http_lua_set_header_t;
633632

634633

src/ngx_http_lua_log_ringbuf.c

+3
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,6 @@ ngx_http_lua_log_ringbuf_read(ngx_http_lua_log_ringbuf_t *rb, int *log_level,
223223

224224
return NGX_OK;
225225
}
226+
227+
228+
/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_http_lua_module.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
10281028
#ifdef LIBRESSL_VERSION_NUMBER
10291029

10301030
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
1031-
"LibreSSL does not support ssl_certificate_by_lua*");
1031+
"LibreSSL is not supported by ssl_certificate_by_lua*");
10321032
return NGX_CONF_ERROR;
10331033

10341034
#else
@@ -1060,7 +1060,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
10601060
if (sscf && sscf->ssl.ctx) {
10611061
#ifdef LIBRESSL_VERSION_NUMBER
10621062
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
1063-
"LibreSSL does not support "
1063+
"LibreSSL is not supported by "
10641064
"ssl_session_store_by_lua*");
10651065

10661066
return NGX_CONF_ERROR;
@@ -1083,7 +1083,7 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
10831083
if (sscf && sscf->ssl.ctx) {
10841084
#ifdef LIBRESSL_VERSION_NUMBER
10851085
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
1086-
"LibreSSL does not support "
1086+
"LibreSSL is not supported by "
10871087
"ssl_session_fetch_by_lua*");
10881088

10891089
return NGX_CONF_ERROR;

src/ngx_http_lua_regex.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ ngx_http_lua_regex_compile(ngx_http_lua_regex_compile_t *rc)
20432043
if ((size_t) erroff == rc->pattern.len) {
20442044
rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
20452045
"pcre_compile() failed: %s in \"%V\"",
2046-
errstr, &rc->pattern)
2046+
errstr, &rc->pattern)
20472047
- rc->err.data;
20482048

20492049
} else {

src/ngx_http_lua_shdict.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static int ngx_http_lua_shdict_llen(lua_State *L);
4444

4545

4646
static ngx_inline ngx_shm_zone_t *ngx_http_lua_shdict_get_zone(lua_State *L,
47-
int index);
47+
int index);
4848

4949

5050
#define NGX_HTTP_LUA_SHDICT_ADD 0x0001

src/ngx_http_lua_util.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -2588,9 +2588,9 @@ ngx_http_lua_process_args_option(ngx_http_request_t *r, lua_State *L,
25882588
if (lua_isboolean(L, -1)) {
25892589
if (lua_toboolean(L, -1)) {
25902590
if (total_escape) {
2591-
p = (u_char *) ngx_http_lua_escape_uri(p, key,
2592-
key_len,
2593-
NGX_ESCAPE_URI_COMPONENT);
2591+
p = (u_char *)
2592+
ngx_http_lua_escape_uri(p, key, key_len,
2593+
NGX_ESCAPE_URI_COMPONENT);
25942594

25952595
} else {
25962596
dd("shortcut: no escape required");
@@ -3371,7 +3371,7 @@ ngx_http_lua_check_broken_connection(ngx_http_request_t *r, ngx_event_t *ev)
33713371
char buf[1];
33723372
ngx_err_t err;
33733373
ngx_int_t event;
3374-
ngx_connection_t *c;
3374+
ngx_connection_t *c;
33753375

33763376
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0,
33773377
"http lua check client, write event:%d, \"%V\"",

0 commit comments

Comments
 (0)