From: Christophe Jaillet Date: Fri, 6 Jan 2017 21:32:59 +0000 (+0000) Subject: Fix some style issue in mod_lua (which is not under RTC) X-Git-Tag: 2.4.26~390 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82ba7c4aec9d04ff5e13ad8f4b9af82aabe858fe;p=thirdparty%2Fapache%2Fhttpd.git Fix some style issue in mod_lua (which is not under RTC) (r1772490 in trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1777719 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c index 3add43648d4..b73d9cbd030 100644 --- a/modules/lua/mod_lua.c +++ b/modules/lua/mod_lua.c @@ -87,7 +87,8 @@ apr_global_mutex_t *lua_ivm_mutex; apr_shm_t *lua_ivm_shm; char *lua_ivm_shmfile; -static apr_status_t shm_cleanup_wrapper(void *unused) { +static apr_status_t shm_cleanup_wrapper(void *unused) +{ if (lua_ivm_shm) { return apr_shm_destroy(lua_ivm_shm); } @@ -149,9 +150,11 @@ static const char *scope_to_string(unsigned int scope) } } -static void ap_lua_release_state(lua_State* L, ap_lua_vm_spec* spec, request_rec* r) { +static void ap_lua_release_state(lua_State* L, ap_lua_vm_spec* spec, request_rec* r) +{ char *hash; apr_reslist_t* reslist = NULL; + if (spec->scope == AP_LUA_SCOPE_SERVER) { ap_lua_server_spec* sspec = NULL; lua_settop(L, 0); @@ -332,7 +335,8 @@ static int lua_handler(request_rec *r) /* ------------------- Input/output content filters ------------------- */ -static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_filter_ctx** c) { +static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_filter_ctx** c) +{ apr_pool_t *pool; ap_lua_vm_spec *spec; int n, rc; @@ -422,7 +426,8 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil return APR_ENOENT; } -static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn) { +static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn) +{ request_rec *r = f->r; int rc; lua_State *L; @@ -591,7 +596,7 @@ static apr_status_t lua_input_filter_handle(ap_filter_t *f, /* While the Lua function is still yielding, pass buckets to the coroutine */ if (!ctx->broken) { lastCall = 0; - while(!APR_BRIGADE_EMPTY(ctx->tmpBucket)) { + while (!APR_BRIGADE_EMPTY(ctx->tmpBucket)) { apr_bucket *pbktIn = APR_BRIGADE_FIRST(ctx->tmpBucket); apr_bucket *pbktOut; const char *data;