Skip to content

Commit 00b92b3

Browse files
agentzhagentzh
committed
style: fixed minor coding style issues found by ngx-releng.
1 parent fcd0dea commit 00b92b3

File tree

5 files changed

+33
-32
lines changed

5 files changed

+33
-32
lines changed

‎src/ngx_http_lua_clfactory.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
* length(Instruction) = 4 or 8
6060
* little endian or big endian
6161
*/
62-
#define LUA_LITTLE_ENDIAN_4BYTES_CODE \
62+
#define LUA_LITTLE_ENDIAN_4BYTES_CODE \
6363
"\x24\x00\x00\x00\x1e\x00\x00\x01\x1e\x00\x80\x00"
64-
#define LUA_LITTLE_ENDIAN_8BYTES_CODE \
65-
"\x24\x00\x00\x00\x00\x00\x00\x00\x1e\x00\x00\x01" \
64+
#define LUA_LITTLE_ENDIAN_8BYTES_CODE \
65+
"\x24\x00\x00\x00\x00\x00\x00\x00\x1e\x00\x00\x01" \
6666
"\x00\x00\x00\x00\x1e\x00\x80\x00\x00\x00\x00\x00"
67-
#define LUA_BIG_ENDIAN_4BYTES_CODE \
67+
#define LUA_BIG_ENDIAN_4BYTES_CODE \
6868
"\x00\x00\x00\x24\x01\x00\x00\x1e\x00\x08\x00\x1e"
69-
#define LUA_BIG_ENDIAN_8BYTES_CODE \
70-
"\x00\x00\x00\x00\x00\x00\x00\x24\x00\x00\x00\x00" \
69+
#define LUA_BIG_ENDIAN_8BYTES_CODE \
70+
"\x00\x00\x00\x00\x00\x00\x00\x24\x00\x00\x00\x00" \
7171
"\x01\x00\x00\x1e\x00\x00\x00\x00\x00\x08\x00\x1e"
7272
#define LUA_LITTLE_ENDIAN_4BYTES_CODE_LEN (4 + 4 + 4)
7373
#define LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN (8 + 8 + 8)
@@ -156,8 +156,8 @@
156156
#define POS_MAX_STACK_SIZE (POS_IS_VAR_ARG + sizeof(char))
157157
#define POS_NUM_OF_INST (POS_MAX_STACK_SIZE +sizeof(char))
158158
#define POS_BYTECODE (POS_NUM_OF_INST + sizeof(int))
159-
#define MAX_BEGIN_CODE_SIZE \
160-
(POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN \
159+
#define MAX_BEGIN_CODE_SIZE \
160+
(POS_BYTECODE + LUA_LITTLE_ENDIAN_8BYTES_CODE_LEN \
161161
+ sizeof(int) + sizeof(int))
162162
#define MAX_END_CODE_SIZE (sizeof(int) + sizeof(int) + sizeof(int))
163163

@@ -225,24 +225,24 @@
225225

226226
/* bytecode for luajit 2.0 */
227227

228-
#define LJ20_LITTLE_ENDIAN_CODE_STRIPPED \
229-
"\x14\x03\x00\x01\x00\x01\x00\x03" \
230-
"\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00" \
228+
#define LJ20_LITTLE_ENDIAN_CODE_STRIPPED \
229+
"\x14\x03\x00\x01\x00\x01\x00\x03" \
230+
"\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00" \
231231
"\x00\x00"
232232

233-
#define LJ20_BIG_ENDIAN_CODE_STRIPPED \
234-
"\x14\x03\x00\x01\x00\x01\x00\x03" \
235-
"\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48" \
233+
#define LJ20_BIG_ENDIAN_CODE_STRIPPED \
234+
"\x14\x03\x00\x01\x00\x01\x00\x03" \
235+
"\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48" \
236236
"\x00\x00"
237237

238-
#define LJ20_LITTLE_ENDIAN_CODE \
239-
"\x15\x03\x00\x01\x00\x01\x00\x03\x00" \
240-
"\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00" \
238+
#define LJ20_LITTLE_ENDIAN_CODE \
239+
"\x15\x03\x00\x01\x00\x01\x00\x03\x00" \
240+
"\x31\x00\x00\x00\x30\x00\x00\x80\x48\x00\x02\x00" \
241241
"\x00\x00"
242242

243-
#define LJ20_BIG_ENDIAN_CODE \
244-
"\x15\x03\x00\x01\x00\x01\x00\x03\x00" \
245-
"\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48" \
243+
#define LJ20_BIG_ENDIAN_CODE \
244+
"\x15\x03\x00\x01\x00\x01\x00\x03\x00" \
245+
"\x00\x00\x00\x31\x80\x00\x00\x30\x00\x02\x00\x48" \
246246
"\x00\x00"
247247

248248
/* bytecode for luajit 2.1 */

‎src/ngx_http_lua_common.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,20 @@
7979

8080
#define NGX_HTTP_LUA_INLINE_TAG "nhli_"
8181

82-
#define NGX_HTTP_LUA_INLINE_TAG_LEN \
82+
#define NGX_HTTP_LUA_INLINE_TAG_LEN \
8383
(sizeof(NGX_HTTP_LUA_INLINE_TAG) - 1)
8484

85-
#define NGX_HTTP_LUA_INLINE_KEY_LEN \
85+
#define NGX_HTTP_LUA_INLINE_KEY_LEN \
8686
(NGX_HTTP_LUA_INLINE_TAG_LEN + 2 * MD5_DIGEST_LENGTH)
8787

8888
/* Nginx HTTP Lua File tag prefix */
8989

9090
#define NGX_HTTP_LUA_FILE_TAG "nhlf_"
9191

92-
#define NGX_HTTP_LUA_FILE_TAG_LEN \
92+
#define NGX_HTTP_LUA_FILE_TAG_LEN \
9393
(sizeof(NGX_HTTP_LUA_FILE_TAG) - 1)
9494

95-
#define NGX_HTTP_LUA_FILE_KEY_LEN \
95+
#define NGX_HTTP_LUA_FILE_KEY_LEN \
9696
(NGX_HTTP_LUA_FILE_TAG_LEN + 2 * MD5_DIGEST_LENGTH)
9797

9898

‎src/ngx_http_lua_exception.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
#include "ngx_http_lua_common.h"
1313

1414

15-
#define NGX_LUA_EXCEPTION_TRY \
15+
#define NGX_LUA_EXCEPTION_TRY \
1616
if (setjmp(ngx_http_lua_exception) == 0)
1717

18-
#define NGX_LUA_EXCEPTION_CATCH \
18+
#define NGX_LUA_EXCEPTION_CATCH \
1919
else
2020

21-
#define NGX_LUA_EXCEPTION_THROW(x) \
21+
#define NGX_LUA_EXCEPTION_THROW(x) \
2222
longjmp(ngx_http_lua_exception, (x))
2323

2424

‎src/ngx_http_lua_probe.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
#define ngx_http_lua_probe_socket_tcp_receive_done(r, u, data, len) \
4545
NGINX_LUA_HTTP_LUA_SOCKET_TCP_RECEIVE_DONE(r, u, data, len)
4646

47-
#define ngx_http_lua_probe_socket_tcp_setkeepalive_buf_unread(r, u, data, len)\
47+
#define ngx_http_lua_probe_socket_tcp_setkeepalive_buf_unread(r, u, data, \
48+
len) \
4849
NGINX_LUA_HTTP_LUA_SOCKET_TCP_SETKEEPALIVE_BUF_UNREAD(r, u, data, len)
4950

5051
#define ngx_http_lua_probe_user_thread_spawn(r, creator, newthread) \

‎src/ngx_http_lua_util.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ void ngx_http_lua_cleanup_free(ngx_http_request_t *r,
250250
ngx_http_cleanup_pt *cleanup);
251251

252252

253-
#define ngx_http_lua_check_if_abortable(L, ctx) \
254-
if ((ctx)->no_abort) { \
255-
return luaL_error(L, "attempt to abort with pending subrequests"); \
253+
#define ngx_http_lua_check_if_abortable(L, ctx) \
254+
if ((ctx)->no_abort) { \
255+
return luaL_error(L, "attempt to abort with pending subrequests"); \
256256
}
257257

258258

@@ -372,7 +372,7 @@ ngx_http_lua_set_globals_table(lua_State *L)
372372
}
373373

374374

375-
#define ngx_http_lua_hash_literal(s) \
375+
#define ngx_http_lua_hash_literal(s) \
376376
ngx_http_lua_hash_str((u_char *) s, sizeof(s) - 1)
377377

378378

0 commit comments

Comments
 (0)