apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Graham Leggett <minf...@sharp.fm>
Subject Re: svn commit: r1207680 - in /apr/apr/trunk: crypto/apr_crypto_nss.c dbd/apr_dbd_sqlite3.c dbm/apr_dbm_sdbm.c test/testreslist.c util-misc/apr_thread_pool.c
Date Mon, 28 Nov 2011 23:29:32 GMT
On 29 Nov 2011, at 01:21, William A. Rowe Jr. wrote:

>> Modified: apr/apr/trunk/dbm/apr_dbm_sdbm.c
>> URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/apr_dbm_sdbm.c?rev=1207680&r1=1207679&r2=1207680&view=diff
>> ==============================================================================
>> --- apr/apr/trunk/dbm/apr_dbm_sdbm.c (original)
>> +++ apr/apr/trunk/dbm/apr_dbm_sdbm.c Mon Nov 28 22:58:09 2011
>> @@ -184,10 +184,9 @@ static apr_status_t vt_sdbm_firstkey(apr
>> 
>>  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;

apr-trunk contains the following explanation for this, I understand it's intended (sf?):

    /*
     * XXX: This discards any error but apr_sdbm_nextkey currently returns
     * XXX: an error for the last key
     */

>> Modified: apr/apr/trunk/util-misc/apr_thread_pool.c
>> URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apr_thread_pool.c?rev=1207680&r1=1207679&r2=1207680&view=diff
>> ==============================================================================
>> --- apr/apr/trunk/util-misc/apr_thread_pool.c (original)
>> +++ apr/apr/trunk/util-misc/apr_thread_pool.c Mon Nov 28 22:58:09 2011
>> @@ -237,7 +237,6 @@ static struct apr_thread_list_elt *elt_n
>>   */
>>  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
>>              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);
>>          }
>>      }

Again, not sure what the correct behaviour is here. The function returns void, so the caller
isn't expecting an error.

Regards,
Graham
--


Mime
View raw message