diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2012-01-29 13:30:57 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-29 13:30:57 +0100 |
| commit | d1d018768afd79cb2ecd1805f0d8f3ed23f4076b (patch) | |
| tree | 04d53b0a9786234f3bbd3badffdb22dbe2b74d03 /srclib/apr-util/dbm/apr_dbm_sdbm.c | |
| parent | 0890390c00801651d08d3794e13b31a5dabbf5ef (diff) | |
| download | apache2-upstream/2.2.22.tar.gz | |
Upstream tarball 2.2.22upstream/2.2.22
Diffstat (limited to 'srclib/apr-util/dbm/apr_dbm_sdbm.c')
| -rw-r--r-- | srclib/apr-util/dbm/apr_dbm_sdbm.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/srclib/apr-util/dbm/apr_dbm_sdbm.c b/srclib/apr-util/dbm/apr_dbm_sdbm.c index 6f531a17..e6cc4aa5 100644 --- a/srclib/apr-util/dbm/apr_dbm_sdbm.c +++ b/srclib/apr-util/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) { @@ -184,10 +184,9 @@ static apr_status_t vt_sdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey) static apr_status_t vt_sdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey) { - apr_status_t rv; apr_sdbm_datum_t rd; - rv = apr_sdbm_nextkey(dbm->file, &rd); + (void)apr_sdbm_nextkey(dbm->file, &rd); pkey->dptr = rd.dptr; pkey->dsize = rd.dsize; |