diff options
| author | Bojan Smojver <bojan@apache.org> | 2009-07-16 04:52:56 +0000 |
|---|---|---|
| committer | Bojan Smojver <bojan@apache.org> | 2009-07-16 04:52:56 +0000 |
| commit | a8a38fa8c6aee51481b3f93ebc6c0a7dbc385191 (patch) | |
| tree | 0c1c98ecda582dad96c430c26da47dc11375a87e /dbm/sdbm | |
| parent | ca371098d7183a23cea08a7605d9a95926864a0a (diff) | |
| download | apr-a8a38fa8c6aee51481b3f93ebc6c0a7dbc385191.tar.gz | |
Convert various APU_DECLARE into APR_DECLARE.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@794523 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbm/sdbm')
| -rw-r--r-- | dbm/sdbm/sdbm.c | 16 | ||||
| -rw-r--r-- | dbm/sdbm/sdbm_lock.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/dbm/sdbm/sdbm.c b/dbm/sdbm/sdbm.c index 9dfcc4bce..7fa9431f5 100644 --- a/dbm/sdbm/sdbm.c +++ b/dbm/sdbm/sdbm.c @@ -167,7 +167,7 @@ error: return status; } -APU_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *file, +APR_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *file, apr_int32_t flags, apr_fileperms_t perms, apr_pool_t *p) { @@ -177,12 +177,12 @@ APU_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *file, return prep(db, dirname, pagname, flags, perms, p); } -APU_DECLARE(apr_status_t) apr_sdbm_close(apr_sdbm_t *db) +APR_DECLARE(apr_status_t) apr_sdbm_close(apr_sdbm_t *db) { return apr_pool_cleanup_run(db->pool, db, database_cleanup); } -APU_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, apr_sdbm_datum_t *val, +APR_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, apr_sdbm_datum_t *val, apr_sdbm_datum_t key) { apr_status_t status; @@ -214,7 +214,7 @@ static apr_status_t write_page(apr_sdbm_t *db, const char *buf, long pagno) return status; } -APU_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db, +APR_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db, const apr_sdbm_datum_t key) { apr_status_t status; @@ -240,7 +240,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db, return status; } -APU_DECLARE(apr_status_t) apr_sdbm_store(apr_sdbm_t *db, apr_sdbm_datum_t key, +APR_DECLARE(apr_status_t) apr_sdbm_store(apr_sdbm_t *db, apr_sdbm_datum_t key, apr_sdbm_datum_t val, int flags) { int need; @@ -399,7 +399,7 @@ static apr_status_t read_from(apr_file_t *f, void *buf, * the following two routines will break if * deletions aren't taken into account. (ndbm bug) */ -APU_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, +APR_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, apr_sdbm_datum_t *key) { apr_status_t status; @@ -423,7 +423,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, return status; } -APU_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, +APR_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, apr_sdbm_datum_t *key) { apr_status_t status; @@ -574,7 +574,7 @@ static apr_status_t getnext(apr_sdbm_datum_t *key, apr_sdbm_t *db) } -APU_DECLARE(int) apr_sdbm_rdonly(apr_sdbm_t *db) +APR_DECLARE(int) apr_sdbm_rdonly(apr_sdbm_t *db) { /* ### Should we return true if the first lock is a share lock, * to reflect that apr_sdbm_store and apr_sdbm_delete will fail? diff --git a/dbm/sdbm/sdbm_lock.c b/dbm/sdbm/sdbm_lock.c index 7d62ffd62..9241c1fb6 100644 --- a/dbm/sdbm/sdbm_lock.c +++ b/dbm/sdbm/sdbm_lock.c @@ -22,7 +22,7 @@ #include "sdbm_tune.h" /* NOTE: this function may block until it acquires the lock */ -APU_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type) +APR_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type) { apr_status_t status; int lock_type = type & APR_FLOCK_TYPEMASK; @@ -68,7 +68,7 @@ APU_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type) return status; } -APU_DECLARE(apr_status_t) apr_sdbm_unlock(apr_sdbm_t *db) +APR_DECLARE(apr_status_t) apr_sdbm_unlock(apr_sdbm_t *db) { if (!(db->flags & (SDBM_SHARED_LOCK | SDBM_EXCLUSIVE_LOCK))) return APR_EINVAL; |