diff options
| author | Graham Leggett <minfrin@apache.org> | 2010-03-02 01:27:42 +0000 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2010-03-02 01:27:42 +0000 |
| commit | edcc309d0e36c8f557219bfbfffa75aadddbafa9 (patch) | |
| tree | 8f92addda767a97c97017deedeab718056170dcd /dbm | |
| parent | a6a059f1425795802aff4c9199d64ee647ee2d09 (diff) | |
| download | apr-edcc309d0e36c8f557219bfbfffa75aadddbafa9.tar.gz | |
Use the APR_FOPEN_* constants instead of the deprecated APR_* constants
within code outside the file_io code.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@917837 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbm')
| -rw-r--r-- | dbm/apr_dbm_sdbm.c | 10 | ||||
| -rw-r--r-- | dbm/sdbm/sdbm.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dbm/apr_dbm_sdbm.c b/dbm/apr_dbm_sdbm.c index 0062a3d30..7a246dd4f 100644 --- a/dbm/apr_dbm_sdbm.c +++ b/dbm/apr_dbm_sdbm.c @@ -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) { diff --git a/dbm/sdbm/sdbm.c b/dbm/sdbm/sdbm.c index 7fa9431f5..3f4d65d92 100644 --- a/dbm/sdbm/sdbm.c +++ b/dbm/sdbm/sdbm.c @@ -101,7 +101,7 @@ static apr_status_t prep(apr_sdbm_t **pdb, const char *dirname, const char *pagn * 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 @@ static apr_status_t prep(apr_sdbm_t **pdb, const char *dirname, const char *pagn * 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. |