apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1207697 - in /apr/apr-util/branches/1.4.x: ./ crypto/apr_crypto_nss.c crypto/apr_crypto_openssl.c dbd/apr_dbd_sqlite3.c dbm/apr_dbm_sdbm.c memcache/apr_memcache.c misc/apr_thread_pool.c test/testmemcache.c test/testreslist.c
Date Mon, 28 Nov 2011 23:21:26 GMT
Author: minfrin
Date: Mon Nov 28 23:21:24 2011
New Revision: 1207697

URL: http://svn.apache.org/viewvc?rev=1207697&view=rev
Log:
Remove variables that we assign but never read.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
    apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c
    apr/apr-util/branches/1.4.x/dbd/apr_dbd_sqlite3.c
    apr/apr-util/branches/1.4.x/dbm/apr_dbm_sdbm.c
    apr/apr-util/branches/1.4.x/memcache/apr_memcache.c
    apr/apr-util/branches/1.4.x/misc/apr_thread_pool.c
    apr/apr-util/branches/1.4.x/test/testmemcache.c
    apr/apr-util/branches/1.4.x/test/testreslist.c

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 23:21:24 2011
@@ -1,4 +1,4 @@
 /apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838
 /apr/apr-util/branches/1.3.x:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
-/apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628
+/apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1207683,1207690
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_nss.c Mon Nov 28 23:21:24 2011
@@ -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();
 }
 
@@ -340,6 +339,7 @@ static apr_status_t crypto_get_block_key
         const apr_crypto_t *f)
 {
     *types = f->types;
+    return APR_SUCCESS;
 }
 
 /**
@@ -354,6 +354,7 @@ static apr_status_t crypto_get_block_key
         const apr_crypto_t *f)
 {
     *modes = f->modes;
+    return APR_SUCCESS;
 }
 
 /**

Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto_openssl.c Mon Nov 28 23:21:24 2011
@@ -102,7 +102,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();
 }
 
@@ -308,6 +307,7 @@ static apr_status_t crypto_get_block_key
         const apr_crypto_t *f)
 {
     *types = f->types;
+    return APR_SUCCESS;
 }
 
 /**
@@ -322,6 +322,7 @@ static apr_status_t crypto_get_block_key
         const apr_crypto_t *f)
 {
     *modes = f->modes;
+    return APR_SUCCESS;
 }
 
 /**

Modified: apr/apr-util/branches/1.4.x/dbd/apr_dbd_sqlite3.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/apr_dbd_sqlite3.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/apr_dbd_sqlite3.c (original)
+++ apr/apr-util/branches/1.4.x/dbd/apr_dbd_sqlite3.c Mon Nov 28 23:21:24 2011
@@ -117,7 +117,6 @@ static int dbd_sqlite3_select_internal(a
             }
         } 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 *);
@@ -156,7 +155,6 @@ static int dbd_sqlite3_select_internal(a
                 case SQLITE_NULL:
                     break;
                 }
-                col = row->columns[i];
             }
             row->rownum = num_tuples++;
             row->next_row = 0;

Modified: apr/apr-util/branches/1.4.x/dbm/apr_dbm_sdbm.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbm/apr_dbm_sdbm.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbm/apr_dbm_sdbm.c (original)
+++ apr/apr-util/branches/1.4.x/dbm/apr_dbm_sdbm.c Mon Nov 28 23:21:24 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;

Modified: apr/apr-util/branches/1.4.x/memcache/apr_memcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/memcache/apr_memcache.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/memcache/apr_memcache.c (original)
+++ apr/apr-util/branches/1.4.x/memcache/apr_memcache.c Mon Nov 28 23:21:24 2011
@@ -774,11 +774,9 @@ apr_memcache_getp(apr_memcache_t *mc,
     if (strncmp(MS_VALUE, conn->buffer, MS_VALUE_LEN) == 0) {
         char *flags;
         char *length;
-        char *start;
         char *last;
         apr_size_t len = 0;
 
-        start = conn->buffer;
         flags = apr_strtok(conn->buffer, " ", &last);
         flags = apr_strtok(NULL, " ", &last);
         flags = apr_strtok(NULL, " ", &last);
@@ -1347,12 +1345,10 @@ apr_memcache_multgetp(apr_memcache_t *mc
                char *key;
                char *flags;
                char *length;
-               char *start;
                char *last;
                char *data;
                apr_size_t len = 0;
 
-               start = conn->buffer;
                key = apr_strtok(conn->buffer, " ", &last); /* just the VALUE, ignore
*/
                key = apr_strtok(NULL, " ", &last);
                flags = apr_strtok(NULL, " ", &last);

Modified: apr/apr-util/branches/1.4.x/misc/apr_thread_pool.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/misc/apr_thread_pool.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/misc/apr_thread_pool.c (original)
+++ apr/apr-util/branches/1.4.x/misc/apr_thread_pool.c Mon Nov 28 23:21:24 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);
         }
     }
 

Modified: apr/apr-util/branches/1.4.x/test/testmemcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/testmemcache.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/testmemcache.c (original)
+++ apr/apr-util/branches/1.4.x/test/testmemcache.c Mon Nov 28 23:21:24 2011
@@ -433,7 +433,6 @@ static void test_memcache_multiget(abts_
   rv = apr_memcache_add_server(memcache, server);
   ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
   
-  values = apr_hash_make(p);
   tdata = apr_hash_make(p);
   
   create_test_hash(pool, tdata);
@@ -487,7 +486,7 @@ static void test_memcache_setget(abts_ca
     apr_status_t rv;
     apr_memcache_t *memcache;
     apr_memcache_server_t *server;
-    apr_hash_t *tdata, *values;
+    apr_hash_t *tdata;
     apr_hash_index_t *hi;
     char *result;
     apr_size_t len;
@@ -502,7 +501,6 @@ static void test_memcache_setget(abts_ca
     ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
 
     tdata = apr_hash_make(pool);
-    values = apr_hash_make(pool);
 
     create_test_hash(pool, tdata);
 

Modified: apr/apr-util/branches/1.4.x/test/testreslist.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/testreslist.c?rev=1207697&r1=1207696&r2=1207697&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/testreslist.c (original)
+++ apr/apr-util/branches/1.4.x/test/testreslist.c Mon Nov 28 23:21:24 2011
@@ -142,7 +142,6 @@ static void test_timeout(abts_case *tc, 
 {
     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, 
     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
      */



Mime
View raw message