Changeset 15207 for gsdl/trunk/src/recpt/userdb.cpp

Timestamp:

2008-04-24T11:41:19+12:00 (16 years ago)

Author:

mdewsnip

Message:

Fixed up some crazy obfuscated lines and fixed a bug where the remove_old_keys() function didn't work because the GDBM file hadn't been opened for writing.

File:

• gsdl/trunk/src/recpt/userdb.cpp (modified) (2 diffs)

gsdl/trunk/src/recpt/userdb.cpp

@@ -374 +374 @@
 {
   storedkeydbfilename = keydbfilename;
-  activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true)) ? false : true;
+  activated = keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true);
   if (activated == false) 
     {
-      activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true)) ? false : true;
+      activated = keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
       if (activated == true)
         {
           keydb.closedatabase();
-          activated = (!keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true)) ? false : true;
+          activated = keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true);
         }
     }
@@ -508 +508 @@
       }
       
-      // delete the keys
-      text_tarray::iterator keys_here = oldkeys.begin();
-      text_tarray::iterator keys_end = oldkeys.end();
-      while (keys_here != keys_end) {
-        keydb.deletekey(*keys_here);
-        ++keys_here;
+      // delete the old keys
+      if (oldkeys.size() > 0) {
+    keydb.closedatabase();
+    keydb.opendatabase(storedkeydbfilename, GDBM_WRCREAT, 1000, true);
+    text_tarray::iterator keys_here = oldkeys.begin();
+    text_tarray::iterator keys_end = oldkeys.end();
+    while (keys_here != keys_end) {
+      keydb.deletekey(*keys_here);
+      ++keys_here;
+    }
+    keydb.closedatabase();
+    keydb.opendatabase(storedkeydbfilename, GDBM_READER, 1000, true);
       }
     }