apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1462758 - in /apr/apr/branches/1.5.x: ./ test/testfile.c test/testlockperf.c test/testmmap.c
Date Sat, 30 Mar 2013 13:54:42 GMT
Author: trawick
Date: Sat Mar 30 13:54:42 2013
New Revision: 1462758

URL: http://svn.apache.org/r1462758
Log:
merge r1389077 (minus the apr-util bits) from trunk

easy fixes for a few warnings about unused variables

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/test/testfile.c
    apr/apr/branches/1.5.x/test/testlockperf.c
    apr/apr/branches/1.5.x/test/testmmap.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1389077

Modified: apr/apr/branches/1.5.x/test/testfile.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/testfile.c?rev=1462758&r1=1462757&r2=1462758&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/testfile.c (original)
+++ apr/apr/branches/1.5.x/test/testfile.c Sat Mar 30 13:54:42 2013
@@ -749,6 +749,7 @@ static void test_writev_buffered_seek(ab
                                      APR_OS_DEFAULT, p));
 
     rv = apr_file_read(f, str, &nbytes);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_STR_EQUAL(tc, TESTSTR, str);
     APR_ASSERT_SUCCESS(tc, "buffered seek", apr_file_seek(f, APR_SET, &off));
 
@@ -950,6 +951,7 @@ static void test_xthread(abts_case *tc, 
         apr_off_t offset = 0;
 
         rv = apr_file_seek(f, APR_END, &offset);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     APR_ASSERT_SUCCESS(tc, "more writes should succeed",
@@ -960,6 +962,7 @@ static void test_xthread(abts_case *tc, 
         apr_off_t offset = 0;
         
         rv = apr_file_seek(f, APR_SET, &offset);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
     
     apr_file_read_full(f, buf, sizeof(buf), NULL);

Modified: apr/apr/branches/1.5.x/test/testlockperf.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/testlockperf.c?rev=1462758&r1=1462757&r2=1462758&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/testlockperf.c (original)
+++ apr/apr/branches/1.5.x/test/testlockperf.c Sat Mar 30 13:54:42 2013
@@ -226,7 +226,6 @@ int main(int argc, const char * const *a
 {
     apr_status_t rv;
     char errmsg[200];
-    const char *lockname = "multi.lock";
     apr_getopt_t *opt;
     char optchar;
     const char *optarg;
@@ -245,13 +244,10 @@ int main(int argc, const char * const *a
         exit(-1);
     }
         
-    while ((rv = apr_getopt(opt, "vf:", &optchar, &optarg)) == APR_SUCCESS) {
+    while ((rv = apr_getopt(opt, "v", &optchar, &optarg)) == APR_SUCCESS) {
         if (optchar == 'v') {
             verbose = 1;
         }
-        if (optchar == 'f') {
-            lockname = optarg;
-        }
     }
 
     if (rv != APR_SUCCESS && rv != APR_EOF) {

Modified: apr/apr/branches/1.5.x/test/testmmap.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/testmmap.c?rev=1462758&r1=1462757&r2=1462758&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/testmmap.c (original)
+++ apr/apr/branches/1.5.x/test/testmmap.c Sat Mar 30 13:54:42 2013
@@ -125,6 +125,7 @@ static void test_mmap_offset(abts_case *
     ABTS_PTR_NOTNULL(tc, themmap);
     rv = apr_mmap_offset(&addr, themmap, 5);
 
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     /* Must use nEquals since the string is not guaranteed to be NULL terminated */
     ABTS_STR_NEQUAL(tc, addr, TEST_STRING + 5, thisfsize-5);
 }



Mime
View raw message