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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/04/01 13:05:05

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonComplexOptions.ml commonPictures.ml 
                           commonWeb.ml 
        src/networks/fileTP: fileTPFTP.ml 

Log message:
        patch #5840

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1216&r2=1.1217
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonPictures.ml?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonWeb.ml?cvsroot=mldonkey&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPFTP.ml?cvsroot=mldonkey&r1=1.15&r2=1.16

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1216
retrieving revision 1.1217
diff -u -b -r1.1216 -r1.1217
--- distrib/ChangeLog   1 Apr 2007 12:16:04 -0000       1.1216
+++ distrib/ChangeLog   1 Apr 2007 13:05:05 -0000       1.1217
@@ -15,6 +15,7 @@
 =========
 
 2007/04/01
+5840: Some small stuff (logging, code improvements)
 5839: IP block: Scan all files inside a .zip file when loading
       a blocklist, use the first valid file
 5831: BT: New option BT-tracker_retries

Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- src/daemon/common/commonComplexOptions.ml   24 Mar 2007 16:49:36 -0000      
1.72
+++ src/daemon/common/commonComplexOptions.ml   1 Apr 2007 13:05:05 -0000       
1.73
@@ -331,7 +331,7 @@
           in
           let network = 
             try network_find_by_name network with e ->
-                lprintf_nl "Network %s not supported" network;
+                lprintf_nl "Loading servers, network %s not supported, 
deleting server" network;
                 raise e
               in
           let server = network_server_of_option network assocs in

Index: src/daemon/common/commonPictures.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonPictures.ml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/daemon/common/commonPictures.ml 11 Mar 2007 22:23:54 -0000      1.2
+++ src/daemon/common/commonPictures.ml 1 Apr 2007 13:05:05 -0000       1.3
@@ -34,7 +34,7 @@
 let flag_html cc =
   let filename = Printf.sprintf "flag_%s.png" (String.lowercase cc) in
   if !!html_flags && Hashtbl.mem files filename then
-    Printf.sprintf "\\<img src=\\\"%s\\\"\\>" filename
+    Printf.sprintf "\\<img src=\\\"%s\\\" alt=\\\"%s\\\"\\>" filename cc
   else
     cc
 

Index: src/daemon/common/commonWeb.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonWeb.ml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/daemon/common/commonWeb.ml      17 Mar 2007 18:03:01 -0000      1.39
+++ src/daemon/common/commonWeb.ml      1 Apr 2007 13:05:05 -0000       1.40
@@ -157,7 +157,7 @@
                      function f, which might hurt other downloads for 
expensive functions *)
                   let others_running = ref 0 in
                   Hashtbl.iter (fun url j ->
-                    if not j.downloaded then others_running := succ 
!others_running
+                    if not j.downloaded then incr others_running
                   ) running_jobs;
                   !others_running
                 in

Index: src/networks/fileTP/fileTPFTP.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPFTP.ml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/networks/fileTP/fileTPFTP.ml    2 Dec 2006 12:35:46 -0000       1.15
+++ src/networks/fileTP/fileTPFTP.ml    1 Apr 2007 13:05:05 -0000       1.16
@@ -464,7 +464,7 @@
       TcpBufferedSocket.set_closer sock (fun _ _ -> ()
 (*        lprintf "Connection closed nread:%b\n" !nread; *)
       )
-  );
+  ) (fun _ -> ());
   ()
 
 (*************************************************************************)