apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r920003 - in /apr/apr-util/branches/1.5.x: ./ buckets/apr_brigade.c buckets/apr_buckets_file.c dbm/apr_dbm_sdbm.c dbm/sdbm/sdbm.c misc/apr_queue.c
Date Sun, 07 Mar 2010 14:45:55 GMT
Author: minfrin
Date: Sun Mar  7 14:45:54 2010
New Revision: 920003

URL: http://svn.apache.org/viewvc?rev=920003&view=rev
Log:
Backport 917837:
Use the APR_FOPEN_* constants instead of the deprecated APR_* constants
within code outside the file_io code.

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/buckets/apr_buckets_file.c
    apr/apr-util/branches/1.5.x/dbm/apr_dbm_sdbm.c
    apr/apr-util/branches/1.5.x/dbm/sdbm/sdbm.c
    apr/apr-util/branches/1.5.x/misc/apr_queue.c   (props changed)

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 14:45:54 2010
@@ -1,2 +1,2 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837
 /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 14:45:54 2010
@@ -1,2 +1,2 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508,917837
 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.5.x/buckets/apr_buckets_file.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/buckets/apr_buckets_file.c?rev=920003&r1=920002&r2=920003&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/buckets/apr_buckets_file.c (original)
+++ apr/apr-util/branches/1.5.x/buckets/apr_buckets_file.c Sun Mar  7 14:45:54 2010
@@ -93,14 +93,14 @@
 #endif
 
 #if APR_HAS_THREADS && !APR_HAS_XTHREAD_FILES
-    if ((flags = apr_file_flags_get(f)) & APR_XTHREAD) {
+    if ((flags = apr_file_flags_get(f)) & APR_FOPEN_XTHREAD) {
         /* this file descriptor is shared across multiple threads and
          * this OS doesn't support that natively, so as a workaround
          * we must reopen the file into a->readpool */
         const char *fname;
         apr_file_name_get(&fname, f);
 
-        rv = apr_file_open(&f, fname, (flags & ~APR_XTHREAD), 0, a->readpool);
+        rv = apr_file_open(&f, fname, (flags & ~APR_FOPEN_XTHREAD), 0, a->readpool);
         if (rv != APR_SUCCESS)
             return rv;
 

Modified: apr/apr-util/branches/1.5.x/dbm/apr_dbm_sdbm.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/apr_dbm_sdbm.c?rev=920003&r1=920002&r2=920003&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/apr_dbm_sdbm.c (original)
+++ apr/apr-util/branches/1.5.x/dbm/apr_dbm_sdbm.c Sun Mar  7 14:45:54 2010
@@ -27,11 +27,11 @@
 #include "apr_dbm_private.h"
 #include "apr_sdbm.h"
 
-#define APR_DBM_DBMODE_RO       (APR_READ | APR_BUFFERED)
-#define APR_DBM_DBMODE_RW       (APR_READ | APR_WRITE)
-#define APR_DBM_DBMODE_RWCREATE (APR_READ | APR_WRITE | APR_CREATE)
-#define APR_DBM_DBMODE_RWTRUNC  (APR_READ | APR_WRITE | APR_CREATE | \
-                                 APR_TRUNCATE)
+#define APR_DBM_DBMODE_RO       (APR_FOPEN_READ | APR_FOPEN_BUFFERED)
+#define APR_DBM_DBMODE_RW       (APR_FOPEN_READ | APR_FOPEN_WRITE)
+#define APR_DBM_DBMODE_RWCREATE (APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_CREATE)
+#define APR_DBM_DBMODE_RWTRUNC  (APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_CREATE | \
+                                 APR_FOPEN_TRUNCATE)
 
 static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said)
 {

Modified: apr/apr-util/branches/1.5.x/dbm/sdbm/sdbm.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/sdbm/sdbm.c?rev=920003&r1=920002&r2=920003&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/sdbm/sdbm.c (original)
+++ apr/apr-util/branches/1.5.x/dbm/sdbm/sdbm.c Sun Mar  7 14:45:54 2010
@@ -101,7 +101,7 @@
      * as required by this package. Also set our internal
      * flag for RDONLY if needed.
      */
-    if (!(flags & APR_WRITE)) {
+    if (!(flags & APR_FOPEN_WRITE)) {
         db->flags |= SDBM_RDONLY;
     }
 
@@ -111,12 +111,12 @@
      * an apr_file_t, in case it's ever introduced, and set
      * our own flag.
      */
-    if (flags & APR_SHARELOCK) {
+    if (flags & APR_FOPEN_SHARELOCK) {
         db->flags |= SDBM_SHARED;
-        flags &= ~APR_SHARELOCK;
+        flags &= ~APR_FOPEN_SHARELOCK;
     }
 
-    flags |= APR_BINARY | APR_READ;
+    flags |= APR_FOPEN_BINARY | APR_FOPEN_READ;
 
     /*
      * open the files in sequence, and stat the dirfile.

Propchange: apr/apr-util/branches/1.5.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 14:45:54 2010
@@ -1,3 +1,3 @@
-/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508
+/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508,917837
 /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



Mime
View raw message