[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/09/01 16:18:53

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml 
        src/daemon/driver: driverMain.ml 
        src/networks/donkey: donkeyGlobals.ml 

Log message:
        patch #5344

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.980&r2=1.981
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.86&r2=1.87

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -b -r1.980 -r1.981
--- distrib/ChangeLog   28 Aug 2006 19:02:17 -0000      1.980
+++ distrib/ChangeLog   1 Sep 2006 16:18:53 -0000       1.981
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/09/01
+5344: Small code optimization for stderr warnings (thx to pango)
+
 2006/08/28
 5341: New command: filenames_variability
 - compute differences between the filenames of a file to detect fakes

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- src/daemon/common/commonInteractive.ml      28 Aug 2006 18:20:18 -0000      
1.78
+++ src/daemon/common/commonInteractive.ml      1 Sep 2006 16:18:53 -0000       
1.79
@@ -97,10 +97,8 @@
 let send_dirfull_warning dir full line1 =
   let status = if full then "is full" else "has enough space again" in
   lprintf_nl "WARNING: Directory %s %s, %s" dir status line1;
-  if (not (keep_console_output ())) then begin
-    Printf.fprintf Pervasives.stderr "\n%s WARNING: Directory %s %s, %s\n" 
(log_time ()) dir status line1;
-    Pervasives.flush Pervasives.stderr;
-  end;
+  if (not (keep_console_output ())) then
+    Printf.eprintf "\n%s WARNING: Directory %s %s, %s\n%!" (log_time ()) dir 
status line1;
   if !!hdd_send_warning_interval <> 0 then
     let current_time = last_time () in
     let time_threshold =

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- src/daemon/driver/driverMain.ml     15 Aug 2006 11:34:10 -0000      1.122
+++ src/daemon/driver/driverMain.ml     1 Sep 2006 16:18:53 -0000       1.123
@@ -590,8 +590,7 @@
   if not (keep_console_output ()) then
     begin
       try
-        Printf.fprintf Pervasives.stderr "%sCore started\n" (log_time ());
-        Pervasives.flush Pervasives.stderr;
+        Printf.eprintf "%s[dMain] Core started\n%!" (log_time ());
       with _ -> ()
     end;
 

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- src/networks/donkey/donkeyGlobals.ml        16 Aug 2006 19:12:10 -0000      
1.86
+++ src/networks/donkey/donkeyGlobals.ml        1 Sep 2006 16:18:53 -0000       
1.87
@@ -984,9 +984,8 @@
                Printf.sprintf "can not create valid client_private_key, bad 
value found: %s"
                  !!client_private_key in
              let s2 = "CryptoPP code seems not to work properly, do not use 
insane CFLAGS, exiting..." in
-             Printf.fprintf Pervasives.stderr "%s[EDK] %s\n" (log_time ()) s1;
-             Printf.fprintf Pervasives.stderr "%s[EDK] %s\n" (log_time ()) s2;
-             Pervasives.flush Pervasives.stderr;
+             Printf.eprintf "%s[EDK] %s\n%!" (log_time ()) s1;
+             Printf.eprintf "%s[EDK] %s\n%!" (log_time ()) s2;
              lprintf_nl "%s" s1;
              lprintf_nl "%s" s2;
              exit 70