diff options
| -rw-r--r-- | crypto/apr_crypto_nss.c | 1 | ||||
| -rw-r--r-- | dbd/apr_dbd_sqlite3.c | 2 | ||||
| -rw-r--r-- | dbm/apr_dbm_sdbm.c | 3 | ||||
| -rw-r--r-- | test/testreslist.c | 3 | ||||
| -rw-r--r-- | util-misc/apr_thread_pool.c | 5 |
5 files changed, 3 insertions, 11 deletions
diff --git a/crypto/apr_crypto_nss.c b/crypto/apr_crypto_nss.c index 4a4b2fca6..bb5c3756d 100644 --- a/crypto/apr_crypto_nss.c +++ b/crypto/apr_crypto_nss.c @@ -114,7 +114,6 @@ static apr_status_t crypto_shutdown(void) static apr_status_t crypto_shutdown_helper(void *data) { - apr_pool_t *pool = (apr_pool_t *) data; return crypto_shutdown(); } diff --git a/dbd/apr_dbd_sqlite3.c b/dbd/apr_dbd_sqlite3.c index 2dd51d217..33f3034f7 100644 --- a/dbd/apr_dbd_sqlite3.c +++ b/dbd/apr_dbd_sqlite3.c @@ -118,7 +118,6 @@ static int dbd_sqlite3_select_internal(apr_pool_t *pool, } } else if (ret == SQLITE_ROW) { int length; - apr_dbd_column_t *col; row = apr_palloc(pool, sizeof(apr_dbd_row_t)); row->res = *results; increment = sizeof(apr_dbd_column_t *); @@ -157,7 +156,6 @@ static int dbd_sqlite3_select_internal(apr_pool_t *pool, case SQLITE_NULL: break; } - col = row->columns[i]; } row->rownum = num_tuples++; row->next_row = 0; diff --git a/dbm/apr_dbm_sdbm.c b/dbm/apr_dbm_sdbm.c index a3735e04e..009192a4c 100644 --- a/dbm/apr_dbm_sdbm.c +++ b/dbm/apr_dbm_sdbm.c @@ -184,10 +184,9 @@ static apr_status_t vt_sdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey) static apr_status_t vt_sdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) { - apr_status_t rv; apr_sdbm_datum_t rd; - rv = apr_sdbm_nextkey(dbm->file, &rd); + apr_sdbm_nextkey(dbm->file, &rd); pkey->dptr = rd.dptr; pkey->dsize = rd.dsize; diff --git a/test/testreslist.c b/test/testreslist.c index aa2481529..36333a153 100644 --- a/test/testreslist.c +++ b/test/testreslist.c @@ -142,7 +142,6 @@ static void test_timeout(abts_case *tc, apr_reslist_t *rl) { apr_status_t rv; my_resource_t *resources[RESLIST_HMAX]; - my_resource_t *res; void *vp; int i; @@ -163,8 +162,6 @@ static void test_timeout(abts_case *tc, apr_reslist_t *rl) rv = apr_reslist_acquire(rl, &vp); ABTS_TRUE(tc, APR_STATUS_IS_TIMEUP(rv)); - res = vp; - /* release the resources; otherwise the destroy operation * will blow */ diff --git a/util-misc/apr_thread_pool.c b/util-misc/apr_thread_pool.c index 006370bae..e8a245b26 100644 --- a/util-misc/apr_thread_pool.c +++ b/util-misc/apr_thread_pool.c @@ -237,7 +237,6 @@ static struct apr_thread_list_elt *elt_new(apr_thread_pool_t * me, */ static void *APR_THREAD_FUNC thread_pool_func(apr_thread_t * t, void *param) { - apr_status_t rv = APR_SUCCESS; apr_thread_pool_t *me = param; apr_thread_pool_task_t *task = NULL; apr_interval_time_t wait; @@ -313,10 +312,10 @@ static void *APR_THREAD_FUNC thread_pool_func(apr_thread_t * t, void *param) wait = -1; if (wait >= 0) { - rv = apr_thread_cond_timedwait(me->cond, me->lock, wait); + apr_thread_cond_timedwait(me->cond, me->lock, wait); } else { - rv = apr_thread_cond_wait(me->cond, me->lock); + apr_thread_cond_wait(me->cond, me->lock); } } |