You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2002/02/06 09:33:27 UTC
cvs commit: apr-util/dbm apr_dbm_berkeleydb.c
jerenkrantz 02/02/06 00:33:27
Modified: dbm apr_dbm_berkeleydb.c
Log:
With Berkeley DB1-based systems, we need to return a NULL nextkey when
we see RET_SPECIAL. (This mimics the earlier change to DB2+, but was
not added to this DB1 code.)
Revision Changes Path
1.17 +6 -3 apr-util/dbm/apr_dbm_berkeleydb.c
Index: apr_dbm_berkeleydb.c
===================================================================
RCS file: /home/cvs/apr-util/dbm/apr_dbm_berkeleydb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_dbm_berkeleydb.c 25 Jan 2002 21:19:54 -0000 1.16
+++ apr_dbm_berkeleydb.c 6 Feb 2002 08:33:27 -0000 1.17
@@ -375,8 +375,11 @@
#if DB_VER == 1
dberr = (*f->bdb->seq)(f->bdb, &ckey, &data, R_NEXT);
- if (dberr == RET_SPECIAL)
- return APR_SUCCESS;
+ if (dberr == RET_SPECIAL) {
+ dberr = 0;
+ ckey.data = NULL;
+ ckey.size = 0;
+ }
#else
if (f->curs == NULL)
return APR_EINVAL;
@@ -387,7 +390,7 @@
f->curs = NULL;
dberr = 0;
ckey.data = NULL;
- ckey.size =0;
+ ckey.size = 0;
}
#endif