1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Fix warnings about unused variable and (false positive) "'mkey' may be used uninitialized in this function"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383022 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-09-10 18:25:17 +00:00
parent 533878b7c7
commit 77e7551062
2 changed files with 1 additions and 4 deletions

View File

@@ -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); apr_pool_userdata_get((void **)&cache_info, mkey, lifecycle_pool);
if (cache_info == NULL) { if (cache_info == NULL) {
cache_info = apr_pcalloc(lifecycle_pool, sizeof(ap_lua_finfo)); 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) { 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; if (cache_info->runs == 0) tryCache = 1;
} }
cache_info->runs++; 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) { if (tryCache == 0 && spec->scope != AP_LUA_SCOPE_ONCE) {
int rc; int rc;

View File

@@ -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) { static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn) {
apr_bucket *e;
request_rec *r = f->r; request_rec *r = f->r;
int rc; int rc;
lua_State *L; lua_State *L;