Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 10555 invoked from network); 7 Mar 2010 15:00:47 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Mar 2010 15:00:47 -0000 Received: (qmail 40200 invoked by uid 500); 7 Mar 2010 15:00:27 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 40105 invoked by uid 500); 7 Mar 2010 15:00:27 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 40098 invoked by uid 99); 7 Mar 2010 15:00:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Mar 2010 15:00:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Mar 2010 15:00:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8EBDB23889BF; Sun, 7 Mar 2010 15:00:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100307150003.8EBDB23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)