apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r920009 - in /apr/apr-util/branches/1.5.x: ./ buckets/apr_brigade.c misc/apr_queue.c test/testbuckets.c test/testldap.c test/testxml.c
Date Sun, 07 Mar 2010 15:00:03 GMT
Author: minfrin
Date: Sun Mar  7 15:00:03 2010
New Revision: 920009

URL: http://svn.apache.org/viewvc?rev=920009&view=rev
Log:
Backport r917838.
Use the APR_FOPEN_* constants instead of the deprecated APR_* constants
within code inside the test suite.

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.5.x/misc/apr_queue.c   (props changed)
    apr/apr-util/branches/1.5.x/test/testbuckets.c
    apr/apr-util/branches/1.5.x/test/testldap.c
    apr/apr-util/branches/1.5.x/test/testxml.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 15:00:03 2010
@@ -1,2 +1,2 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.5.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 15:00:03 2010
@@ -1,2 +1,2 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508,917837
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508,917837-917838
 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.5.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 15:00:03 2010
@@ -1,3 +1,3 @@
-/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508,917837
+/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508,917837-917838
 /apr/apr/trunk/util-misc/apr_queue.c:784520
 /apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.5.x/test/testbuckets.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/testbuckets.c?rev=920009&r1=920008&r2=920009&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/testbuckets.c (original)
+++ apr/apr-util/branches/1.5.x/test/testbuckets.c Sun Mar  7 15:00:03 2010
@@ -368,7 +368,7 @@
 
     ABTS_ASSERT(tc, "create test file",
                 apr_file_open(&f, fname,
-                              APR_READ|APR_WRITE|APR_TRUNCATE|APR_CREATE,
+                              APR_FOPEN_READ|APR_FOPEN_WRITE|APR_FOPEN_TRUNCATE|APR_FOPEN_CREATE,
                               APR_OS_DEFAULT, p) == APR_SUCCESS);
     
     ABTS_ASSERT(tc, "write test file contents",

Modified: apr/apr-util/branches/1.5.x/test/testldap.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/testldap.c?rev=920009&r1=920008&r2=920009&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/testldap.c (original)
+++ apr/apr-util/branches/1.5.x/test/testldap.c Sun Mar  7 15:00:03 2010
@@ -80,7 +80,7 @@
 
     ldap_host[0] = '\0';
     rv = apr_file_open(&thefile, FILENAME, 
-                       APR_READ, 
+                       APR_FOPEN_READ,
                        APR_UREAD | APR_UWRITE | APR_GREAD, p);
     if (rv != APR_SUCCESS) {
         return 0;

Modified: apr/apr-util/branches/1.5.x/test/testxml.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/testxml.c?rev=920009&r1=920008&r2=920009&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/testxml.c (original)
+++ apr/apr-util/branches/1.5.x/test/testxml.c Sun Mar  7 15:00:03 2010
@@ -28,8 +28,8 @@
     apr_off_t off = 0L;
     char template[] = "data/testxmldummyerrorXXXXXX";
 
-    rv = apr_file_mktemp(fd, template, APR_CREATE | APR_TRUNCATE | APR_DELONCLOSE |
-                         APR_READ | APR_WRITE | APR_EXCL, p);
+    rv = apr_file_mktemp(fd, template, APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE | APR_FOPEN_DELONCLOSE
|
+                         APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_EXCL, p);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
@@ -62,8 +62,8 @@
     apr_off_t off = 0L;
     char template[] = "data/testxmldummyXXXXXX";
 
-    rv = apr_file_mktemp(fd, template, APR_CREATE | APR_TRUNCATE | APR_DELONCLOSE |
-                         APR_READ | APR_WRITE | APR_EXCL, p);
+    rv = apr_file_mktemp(fd, template, APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE | APR_FOPEN_DELONCLOSE
|
+                         APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_EXCL, p);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)



Mime
View raw message