[Mldonkey-commits] Changes to mldonkey/src/networks/donkey/donkeyMain.ml

[mldonkey-commits]

Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.31 
mldonkey/src/networks/donkey/donkeyMain.ml:1.32
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.31     Thu Jul  7 00:25:46 2005
+++ mldonkey/src/networks/donkey/donkeyMain.ml  Fri Jul 22 10:58:55 2005
@@ -45,6 +45,9 @@
 open DonkeyThieves
 open DonkeyOptions
 
+let lprintf_nl () =
+  lprintf "%s[EDK]: "
+  (log_time ()); lprintf_nl2
 
 let _ =
   network.op_network_is_enabled <- (fun _ -> !!enable_donkey);
@@ -75,7 +78,7 @@
       DonkeySources.connect_sources connection_manager;
     with e ->
         if !verbose_sources > 2 then 
-          lprintf_nl "Exception %s while checking sources" 
+          lprintf_nl () "Exception %s while checking sources" 
             (Printexc2.to_string e)
   )
 
@@ -204,7 +207,7 @@
                   if Unix32.file_exists file_disk_name &&
                     Unix32.getsize file_disk_name false <> Int64.zero then 
begin
                     (* getsize writable=false is ok because file has state 
FileDownloaded *)
-                      lprintf_nl "FILE DOWNLOADED"; 
+                      lprintf_nl () "FILE DOWNLOADED"; 
                       
                       DonkeyOneFile.declare_completed_file file;
                     end
@@ -213,7 +216,7 @@
                     file_commit (as_file file)
               end
           with e ->
-              lprintf_nl "Exception %s while recovering download %s"
+              lprintf_nl () "Exception %s while recovering download %s"
                 (Printexc2.to_string e) (file_disk_name file); 
       ) files_by_md4;
       
@@ -256,7 +259,7 @@
               udp_sock := Some sock;
               UdpSocket.set_write_controler sock udp_write_controler;
             with e ->
-                lprintf_nl "Exception %s while binding UDP socket"
+                lprintf_nl () "Exception %s while binding UDP socket"
                   (Printexc2.to_string e);
           end;
           sock
@@ -328,7 +331,7 @@
 *)
 
   with e ->
-      lprintf_nl "Error: Exception %s during startup"
+      lprintf_nl () "Error: Exception %s during startup"
         (Printexc2.to_string e)
 
 let _ =
@@ -375,21 +378,21 @@
         let s = File.to_string file in
         let t = K.read s in
         K.print t;
-        lprintf_nl "";
+        lprint_newline ();
     ), " <filename> : print a known.met file";
     "-part", Arg.String (fun file ->
         let module K = DonkeyImport.Part in
         let s = File.to_string file in
         let t = K.read s in
         K.print t;
-        lprintf_nl "";
+        lprint_newline ();
     ), " <filename> : print a .part.met file";
     "-server", Arg.String (fun file ->
         let module K = DonkeyImport.Server in
         let s = File.to_string file in
         let t = K.read s in
         K.print t;
-        lprintf_nl "";
+        lprint_newline ();
         exit 0
     ), " <filename> : print a server.met file";
     "-pref", Arg.String (fun file ->
@@ -397,14 +400,14 @@
         let s = File.to_string file in
         let t = K.read s in
         K.print t;
-        lprintf_nl "";
+        lprint_newline ();
     ), " <filename> : print a server.met file";
     "-peers", Arg.String (fun file ->
         let module K = DonkeyOvernetImport.Peer in
         let s = File.to_string file in
         let t = K.read s in
         K.print t;
-        lprintf_nl "";
+        lprint_newline ();
         exit 0
     ), " <filename> : print a contact.dat file";
   ]