You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ia...@apache.org on 2001/12/04 18:34:00 UTC
cvs commit: apr-util/dbm apr_dbm_berkeleydb.c
ianh 01/12/04 09:34:00
Modified: . CHANGES
dbm apr_dbm_berkeleydb.c
Log:
Berkeley DB v2 had a API change in a minor version.
DB v2 doesn't have strerror
Revision Changes Path
1.42 +1 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- CHANGES 2001/11/29 07:43:40 1.41
+++ CHANGES 2001/12/04 17:33:59 1.42
@@ -1,4 +1,5 @@
Changes with APR-util b1
+ *) BerkeleyDBM v2 now checks minor level for cursor ops [Ian Holsman]
*) Reading a file bucket bigger than APR_MMAP_LIMIT (4MB) now yields
a string of 4MB mmap buckets, rather than a string of 8KB heap buckets
1.10 +5 -0 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_dbm_berkeleydb.c 2001/11/29 10:01:17 1.9
+++ apr_dbm_berkeleydb.c 2001/12/04 17:33:59 1.10
@@ -168,6 +168,9 @@
if ((dberr = (*f->bdb->cursor)(f->bdb, NULL, &f->curs
#if DB_VER == 3
, 0
+#elif ( DB_VERSION_MAJOR == 2 ) && ( DB_VERSION_MINOR > 5)
+ , 0
+
#endif
)) == 0) {
dberr = (*f->curs->c_get)(f->curs, pkey, &data, DB_FIRST);
@@ -228,6 +231,8 @@
/* ### use db_strerror() */
dbm->errcode = dbm_said;
#if DB_VER == 1
+ dbm->errmsg = NULL;
+#elif DB_VER == 2
dbm->errmsg = NULL;
#else
dbm->errmsg = db_strerror(dbm_said - APR_OS_START_USEERR);