cscvs to tla changeset 82

[onak.git] / keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index cffdb15c07ef3217caf164cf23cb6c978f1d4dcf..1aba9199dea0442b6de2c39ebe4c5bb10cd9edfe 100644 (file)
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: keydb_db3.c,v 1.16 2003/06/04 20:57:08 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -191,6 +193,7 @@ void initdb(void)
  */
 void cleanupdb(void)
 {
  */
 void cleanupdb(void)
 {

+       txn_checkpoint(dbenv, 0, 0, 0);

        worddb->close(worddb, 0);
        worddb = NULL;
        dbconn->close(dbconn, 0);
        worddb->close(worddb, 0);
        worddb = NULL;
        dbconn->close(dbconn, 0);


@@ -758,7 +761,10 @@ int dumpdb(char *filenamebase)
                memset(&data, 0, sizeof(data));
                ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
        }
                memset(&data, 0, sizeof(data));
                ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
        }

-       logthing(LOGTHING_ERROR, "Problem reading key: %s", db_strerror(ret));
+       if (ret != DB_NOTFOUND) {
+               logthing(LOGTHING_ERROR, "Problem reading key: %s",
+                               db_strerror(ret));
+       }

 
        close(fd);
 
 
        close(fd);