[Nym3-commit] r25 - trunk

[nym3-devel@lists.noreply.org]

Author: laurent
Date: 2004-05-18 19:04:49 +0200 (Tue, 18 May 2004)
New Revision: 25

Modified:
   trunk/TODO
   trunk/user.ml
Log:
Dbm performs lock by itself. We have a culprit if it's not true.


Modified: trunk/TODO
===================================================================
--- trunk/TODO	2004-05-16 12:56:33 UTC (rev 24)
+++ trunk/TODO	2004-05-18 17:04:49 UTC (rev 25)
@@ -9,4 +9,4 @@
         X Abandoned
 
 
- X - Quite a lot!
+ - In case something brake, remember it's emag's fault.

Modified: trunk/user.ml
===================================================================
--- trunk/user.ml	2004-05-16 12:56:33 UTC (rev 24)
+++ trunk/user.ml	2004-05-18 17:04:49 UTC (rev 25)
@@ -20,28 +20,26 @@
 				  hold_policy : hold; shutdown : string;
 				  max_queued : int; max_size : int; max_space : int };;
 
-let lockopen_userdb path =
-	(* TODO : add the "lock" part *)
+let open_userdb path =
 	Dbm.opendbm path [Dbm.Dbm_rdwr; Dbm.Dbm_create] (6 * 64 + 4 * 8);;
 	
-let unlockclose_userdb db = 
-	(* TODO : add the "unlock" part *)
+let close_userdb db = 
 	Dbm.close db;;
 
 let read_userdata nym =
-	let db = lockopen_userdb !Config.userdb in
+	let db = open_userdb !Config.userdb in
 	let marshalled = 
 	try
 		Dbm.find db nym
 	with
 		Not_found -> unlockclose_userdb db; raise Not_found; ""
 	in
-	unlockclose_userdb db;
+	close_userdb db;
 	(Marshal.from_string marshalled 0 : userdata);;
 
 let write_userdata nym data =
-	let db = lockopen_userdb !Config.userdb in
+	let db = open_userdb !Config.userdb in
 	let marshalled = Marshal.to_string data [] in
 	Dbm.replace db nym marshalled;
-	unlockclose_userdb db;;
+	close_userdb db;;