apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1836230 - in /apr/apr-util/branches/1.7.x: ./ test/testdbd.c test/testmemcache.c test/testredis.c test/testuri.c
Date Wed, 18 Jul 2018 20:22:54 GMT
Author: minfrin
Date: Wed Jul 18 20:22:54 2018
New Revision: 1836230

URL: http://svn.apache.org/viewvc?rev=1836230&view=rev
Log:
Backport r1836229

Remove dead assignments.

Modified:
    apr/apr-util/branches/1.7.x/   (props changed)
    apr/apr-util/branches/1.7.x/test/testdbd.c
    apr/apr-util/branches/1.7.x/test/testmemcache.c
    apr/apr-util/branches/1.7.x/test/testredis.c
    apr/apr-util/branches/1.7.x/test/testuri.c

Propchange: apr/apr-util/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 18 20:22:54 2018
@@ -1,4 +1,4 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378,1772414,1778153,1781391,1782042,1782045,1788335,1789947,1809394,1811470,1820080,1825311,1833359,1833366,1833382,1833421,1833425-1833426,1833440,1833449-1833451,1833456,1
 833525,1833599,1833993,1833995,1834022-1834024,1834551,1835392,1836017
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378,1772414,1778153,1781391,1782042,1782045,1788335,1789947,1809394,1811470,1820080,1825311,1833359,1833366,1833382,1833421,1833425-1833426,1833440,1833449-1833451,1833456,1
 833525,1833599,1833993,1833995,1834022-1834024,1834551,1835392,1836017,1836229
 /apr/apr-util/branches/1.3.x:896410,1154885
 /apr/apr-util/branches/1.4.x:1126217,1211211,1211219,1211223,1211330
 /apr/apr-util/branches/1.5.x:1757430

Modified: apr/apr-util/branches/1.7.x/test/testdbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/test/testdbd.c?rev=1836230&r1=1836229&r2=1836230&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/test/testdbd.c (original)
+++ apr/apr-util/branches/1.7.x/test/testdbd.c Wed Jul 18 20:22:54 2018
@@ -154,7 +154,7 @@ static void test_dbd_generic(abts_case *
     native = apr_dbd_native_handle(driver, handle);
     ABTS_PTR_NOTNULL(tc, native);
 
-    rv = apr_dbd_check_conn(driver, pool, handle);
+    apr_dbd_check_conn(driver, pool, handle);
 
     create_table(tc, handle, driver);
     select_rows(tc, handle, driver, 0);

Modified: apr/apr-util/branches/1.7.x/test/testmemcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/test/testmemcache.c?rev=1836230&r1=1836229&r2=1836230&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/test/testmemcache.c (original)
+++ apr/apr-util/branches/1.7.x/test/testmemcache.c Wed Jul 18 20:22:54 2018
@@ -258,10 +258,10 @@ static void test_memcache_meta(abts_case
     rv = apr_memcache_add_server(memcache, server);
     ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
 
-    rv = apr_memcache_version(server, pool, &result);
+    apr_memcache_version(server, pool, &result);
     ABTS_PTR_NOTNULL(tc, result);
 
-    rv = apr_memcache_stats(server, p, &stats);
+    apr_memcache_stats(server, p, &stats);
     ABTS_PTR_NOTNULL(tc, stats);
 
     ABTS_STR_NEQUAL(tc, stats->version, result, 5);
@@ -450,7 +450,7 @@ static void test_memcache_multiget(abts_
     ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
   }
   
-  rv = apr_pool_create(&tmppool, pool);
+  apr_pool_create(&tmppool, pool);
   for (i = 0; i < TDATA_SET; i++)
     apr_memcache_add_multget_key(pool,
                                  apr_pstrcat(pool, prefix,

Modified: apr/apr-util/branches/1.7.x/test/testredis.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/test/testredis.c?rev=1836230&r1=1836229&r2=1836230&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/test/testredis.c (original)
+++ apr/apr-util/branches/1.7.x/test/testredis.c Wed Jul 18 20:22:54 2018
@@ -259,10 +259,10 @@ static void test_redis_meta(abts_case *
     rv = apr_redis_add_server(redis, server);
     ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
 
-    rv = apr_redis_version(server, pool, &result);
+    apr_redis_version(server, pool, &result);
     ABTS_PTR_NOTNULL(tc, result);
 
-    rv = apr_redis_stats(server, p, &stats);
+    apr_redis_stats(server, p, &stats);
     ABTS_PTR_NOTNULL(tc, stats);
 
     /* 

Modified: apr/apr-util/branches/1.7.x/test/testuri.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/test/testuri.c?rev=1836230&r1=1836229&r2=1836230&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/test/testuri.c (original)
+++ apr/apr-util/branches/1.7.x/test/testuri.c Wed Jul 18 20:22:54 2018
@@ -284,7 +284,7 @@ static void test_aup(abts_case *tc, void
             ABTS_STR_EQUAL(tc, t->uri, s);
 
             s = apr_uri_unparse(p, &info, APR_URI_UNP_OMITSITEPART);
-            rv = apr_uri_parse(p, s, &info);
+            apr_uri_parse(p, s, &info);
             ABTS_STR_EQUAL(tc, info.scheme, NULL);
             ABTS_STR_EQUAL(tc, info.hostinfo, NULL);
             ABTS_STR_EQUAL(tc, info.user, NULL);



Mime
View raw message