summaryrefslogtreecommitdiff
path: root/dbm
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2010-07-28 20:30:52 +0000
committerStefan Fritsch <sf@apache.org>2010-07-28 20:30:52 +0000
commit5865b1bdeb0da168bf53feb3325a2a8155ac4245 (patch)
tree5a199371fc6cf1f021e283e4259567e9ff85539e /dbm
parent443247b17081cb00b0e7f2f688889417cb45871f (diff)
downloadapr-5865b1bdeb0da168bf53feb3325a2a8155ac4245.tar.gz
For now, revert part of r979891 to fix test breakage. But the error handling
of apr_sdbm_nextkey seems broken. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@980197 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbm')
-rw-r--r--dbm/apr_dbm_sdbm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/dbm/apr_dbm_sdbm.c b/dbm/apr_dbm_sdbm.c
index 7c105d2eb..a3735e04e 100644
--- a/dbm/apr_dbm_sdbm.c
+++ b/dbm/apr_dbm_sdbm.c
@@ -192,8 +192,11 @@ static apr_status_t vt_sdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
pkey->dptr = rd.dptr;
pkey->dsize = rd.dsize;
- /* store any error info into DBM, and return a status code. */
- return set_error(dbm, rv);
+ /*
+ * XXX: This discards any error but apr_sdbm_nextkey currently returns
+ * XXX: an error for the last key
+ */
+ return set_error(dbm, APR_SUCCESS);
}
static void vt_sdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)