Fix warnings about unused variable and (false positive) "'mkey' may be used uninitial...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383022 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 02d030fbfb7e2d32c2bb7359023060bdad40e813..6302706111d639e84ef9cbd7d5cb6d047dc2044e 100644 (file)
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -460,6 +460,7 @@ AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
             apr_pool_userdata_get((void **)&cache_info, mkey, lifecycle_pool);
             if (cache_info == NULL) {
                 cache_info = apr_pcalloc(lifecycle_pool, sizeof(ap_lua_finfo));
+                apr_pool_userdata_set((void*) cache_info, mkey, NULL, lifecycle_pool);
             }
         }
         if (spec->codecache == AP_LUA_CACHE_STAT) {
@@ -480,9 +481,6 @@ AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
             if (cache_info->runs == 0) tryCache = 1;
         }
         cache_info->runs++;
-        if (spec->scope != AP_LUA_SCOPE_SERVER) {
-            apr_pool_userdata_set((void*) cache_info, mkey, NULL, lifecycle_pool);
-        }
     }
     if (tryCache == 0 && spec->scope != AP_LUA_SCOPE_ONCE) {
         int rc;

diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
index 22620b5da97647279779d9171bb493f4283f9009..59ce62c497dfe8dd585666aaffa2232826f8a892 100644 (file)
--- a/modules/lua/mod_lua.c
+++ b/modules/lua/mod_lua.c
@@ -383,7 +383,6 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil
 }
 
 static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn) {
-    apr_bucket *e;
     request_rec *r = f->r;
     int rc;
     lua_State *L;