[Mldonkey-commits] mldonkey distrib/ChangeLog src/config/unix/mlUn...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/05 13:19:14

Modified files:
        distrib        : ChangeLog 
        src/config/unix: mlUnix.ml 
        src/daemon/common: commonServer.ml commonTypes.ml 
        src/daemon/driver: driverCommands.ml driverInteractive.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/networks/donkey: donkeyInteractive.ml 
        src/networks/fasttrack: fasttrackProtocol.ml 
        src/networks/fileTP: fileTPInteractive.ml 
        src/utils/cdk  : printf2.ml zlib.ml 
        src/utils/lib  : misc2_bz2.ml 
        src/utils/net  : mailer.ml 

Log message:
        patch #4871

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.714&tr2=1.715&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/config/unix/mlUnix.ml.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonServer.ml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonTypes.ml.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.122&tr2=1.123&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fasttrack/fasttrackProtocol.ml.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/printf2.ml.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/zlib.ml.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/misc2_bz2.ml.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/mailer.ml.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.714 mldonkey/distrib/ChangeLog:1.715
--- mldonkey/distrib/ChangeLog:1.714    Sun Feb  5 13:17:56 2006
+++ mldonkey/distrib/ChangeLog  Sun Feb  5 13:19:14 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/05
+4871: Optimize some Printf.sprintf "%s" code
 4869: Remove obsolete redirector code
       http://mldonkey.sourceforge.net/Redirector
 4856: reverse patch: configure: disable iconv by default on MinGW
Index: mldonkey/src/config/unix/mlUnix.ml
diff -u mldonkey/src/config/unix/mlUnix.ml:1.13 
mldonkey/src/config/unix/mlUnix.ml:1.14
--- mldonkey/src/config/unix/mlUnix.ml:1.13     Wed Dec 28 21:37:39 2005
+++ mldonkey/src/config/unix/mlUnix.ml  Sun Feb  5 13:19:14 2006
@@ -108,6 +108,6 @@
 let glibc_version_num () =
   begin
     try
-      let s = Printf.sprintf "%s" (glibc_version ()) in s
+      glibc_version ()
     with e -> ""
   end
Index: mldonkey/src/daemon/common/commonServer.ml
diff -u mldonkey/src/daemon/common/commonServer.ml:1.25 
mldonkey/src/daemon/common/commonServer.ml:1.26
--- mldonkey/src/daemon/common/commonServer.ml:1.25     Mon Jan 16 16:05:14 2006
+++ mldonkey/src/daemon/common/commonServer.ml  Sun Feb  5 13:19:14 2006
@@ -402,15 +402,12 @@
     \\<td class=\\\"sr\\\"\\>%s\\</td\\>
     \\<td width=\\\"100%%\\\" class=\\\"sr\\\"\\>%s\\</td\\>\\</tr\\>\n"
     (html_mods_cntr ())
-    (
-        Printf.sprintf "%s"
-        (match impl.impl_server_state with
+    (match impl.impl_server_state with
         Connected _ -> Printf.sprintf "title=\\\"Server Banner\\\"
             onMouseOver=\\\"mOvr(this);\\\"
             onMouseOut=\\\"mOut(this);\\\"
             onClick=\\\"location.href='submit?q=server_banner+%d'\\\"" snum
         | _ -> "")
-    )
     snum
       (
         if server_blocked s && (match impl.impl_server_state with
Index: mldonkey/src/daemon/common/commonTypes.ml
diff -u mldonkey/src/daemon/common/commonTypes.ml:1.48 
mldonkey/src/daemon/common/commonTypes.ml:1.49
--- mldonkey/src/daemon/common/commonTypes.ml:1.48      Mon Jan  9 00:22:35 2006
+++ mldonkey/src/daemon/common/commonTypes.ml   Sun Feb  5 13:19:14 2006
@@ -657,14 +657,14 @@
 | Ogg_audio_avgbytespersec r -> Printf.sprintf "%.0f kbps" (r *. 8. /. 1000.)
 | Ogg_vorbis_version r -> Printf.sprintf "vorbis version: %.0f" r
 | Ogg_vorbis_sample_rate r -> Printf.sprintf "%.0f Hz" r
-| Ogg_vorbis_bitrates l -> Printf.sprintf "%s" (vorbis_bitrates_to_string l)
+| Ogg_vorbis_bitrates l -> vorbis_bitrates_to_string l
 | Ogg_vorbis_blocksize_0 n -> Printf.sprintf "blocksize_0: %d" (int_of_float 
(2. ** float_of_int n))
 | Ogg_vorbis_blocksize_1 n -> Printf.sprintf "blocksize_1: %d" (int_of_float 
(2. ** float_of_int n))
 | Ogg_video_width r -> Printf.sprintf "width: %.0f pixels" r
 | Ogg_video_height r -> Printf.sprintf "height: %.0f pixels" r
 | Ogg_video_sample_rate r -> Printf.sprintf "%.3f fps" r
 | Ogg_aspect_ratio r -> Printf.sprintf "1:%0.5f" r
-| Ogg_theora_cs cs -> Printf.sprintf "%s" (theora_cs_to_string cs)
+| Ogg_theora_cs cs -> theora_cs_to_string cs
 | Ogg_theora_quality n -> Printf.sprintf "%d [quality]" n
 | Ogg_theora_avgbytespersec n -> Printf.sprintf "%d kbps" (n / 1000)
 
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.122 
mldonkey/src/daemon/driver/driverCommands.ml:1.123
--- mldonkey/src/daemon/driver/driverCommands.ml:1.122  Sun Feb  5 13:17:40 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Sun Feb  5 13:19:14 2006
@@ -1365,9 +1365,9 @@
               begin
                 if use_html_mods o then
                   custom_commands := !custom_commands @ [ ( "bu bbig",
-                  Printf.sprintf "%s" name,
+                  name,
                   Printf.sprintf 
"top.output.location.href='submit\\?custom=%s'" (Url.encode name),
-                  Printf.sprintf "%s" name ) ; ]
+                  name ) ; ]
                 else
                   Printf.bprintf buf
                     "\\<a href=\\\"submit\\?custom=%s\\\" $O\\> %s \\</a\\>\n"
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.60 
mldonkey/src/daemon/driver/driverInteractive.ml:1.61
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.60        Fri Feb  3 
03:12:14 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Sun Feb  5 13:19:14 2006
@@ -1741,7 +1741,7 @@
       ^ "\nIP blocking:\t " ^ (let r1,r2 = Ip_set.block_stats () in
           if r1 = 0 then dis_mess else Printf.sprintf "enabled, %d ranges 
loaded - optimized to %d" r1 r2)
       ^ "\nSystem info:\t " ^ (let uname = Unix32.uname () in
-          if uname <> "" then Printf.sprintf "%s" uname else "unknown")
+          if uname <> "" then uname else "unknown")
       ^ "\n\t\t language: " ^ Charset.default_language
       ^ " - locale: " ^ Charset.locstr
       ^ " - UTC offset: " ^ Rss_date.mk_timezone (Unix.time ())
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.80 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.81
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.80      Sun Jan 29 
18:42:02 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Sun Feb  5 13:19:14 2006
@@ -145,7 +145,7 @@
          tracker_string := (if tracker.tracker_enabled then "" else "*") ^ 
           !tracker_string ^ (shorten tracker.tracker_url !!max_name_len) ^ " "
       ) file.file_trackers;
-      Printf.sprintf "%s" !tracker_string)) ];
+      !tracker_string)) ];
 
   Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr 
());
 
@@ -242,13 +242,13 @@
               Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" 
(html_mods_cntr ());
               html_mods_td buf [
                ("Tracker id", "sr br", "Tracker id");
-               ("", "sr", Printf.sprintf "%s" t.tracker_id) ]
+               ("", "sr", t.tracker_id) ]
             end;
            if String.length t.tracker_key > 0 then begin
               Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" 
(html_mods_cntr ());
               html_mods_td buf [
                ("Tracker key", "sr br", "Tracker key");
-               ("", "sr", Printf.sprintf "%s" t.tracker_key) ]
+               ("", "sr", t.tracker_key) ]
            end 
          end in
   print_first_tracker file.file_trackers;
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.89 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.90
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.89      Sun Feb  5 
13:17:40 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Sun Feb  5 13:19:14 2006
@@ -554,8 +554,7 @@
             CommonInteractive.start_download file;
             "", true
           with e ->
-            let s = Printf.sprintf "%s" (Printexc2.to_string e) in
-             s, false
+            (Printexc2.to_string e), false
           end
   | "ed2k://" :: "server" :: ip :: port :: _
   | "server" :: ip :: port :: _ ->
@@ -1106,8 +1105,7 @@
     match c.client_kind with
       Direct_address (ip,port) -> 
         let cc,cn = Geoip.get_country ip in
-        Printf.sprintf "%s" (Ip.to_string ip)
-        ,cc,cn
+        (Ip.to_string ip),cc,cn
     | _ ->  
         let cc,cn = !Geoip.unknown_country in
         (string_of_client_addr c),cc,cn
@@ -1364,7 +1362,7 @@
           html_mods_td buf ([
             ("", "sr", (match c.client_download with
                   None -> ""
-                | Some _ -> Printf.sprintf "%s" (
+                | Some _ -> (
                       let qfiles = c.client_file_queue in
                       let (qfile, qchunks,_) =  List.hd qfiles in
                       if (qfile == file) then
Index: mldonkey/src/networks/fasttrack/fasttrackProtocol.ml
diff -u mldonkey/src/networks/fasttrack/fasttrackProtocol.ml:1.10 
mldonkey/src/networks/fasttrack/fasttrackProtocol.ml:1.11
--- mldonkey/src/networks/fasttrack/fasttrackProtocol.ml:1.10   Wed Dec 14 
21:17:46 2005
+++ mldonkey/src/networks/fasttrack/fasttrackProtocol.ml        Sun Feb  5 
13:19:14 2006
@@ -226,7 +226,7 @@
     end;  *)
   let headers =
 (*      Printf.bprintf buf "User-Agent: %s\r\n" user_agent; *)
-    ("X-Kazaa-Network", Printf.sprintf "%s" FasttrackNetwork.network_name) ::
+    ("X-Kazaa-Network", FasttrackNetwork.network_name) ::
     ("Connection", "Keep-Alive") ::
     ("X-Kazaa-Username", client_name ()) ::
     ("Connection", "Keep-Alive") ::
Index: mldonkey/src/networks/fileTP/fileTPInteractive.ml
diff -u mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.30 
mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.31
--- mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.30      Sun Jan 29 
18:42:53 2006
+++ mldonkey/src/networks/fileTP/fileTPInteractive.ml   Sun Feb  5 13:19:14 2006
@@ -400,7 +400,7 @@
               Printf.bprintf buf "Not enough parameters";
             _s ""
        | e ->
-           let error = Printf.sprintf "%s" (Printexc2.to_string e) in
+           let error = Printexc2.to_string e in
             let buf = o.conn_buf in
             if o.conn_output = HTML then
               html_mods_table_one_row buf "serversTable" "servers" [
Index: mldonkey/src/utils/cdk/printf2.ml
diff -u mldonkey/src/utils/cdk/printf2.ml:1.14 
mldonkey/src/utils/cdk/printf2.ml:1.15
--- mldonkey/src/utils/cdk/printf2.ml:1.14      Wed Dec 14 21:17:47 2005
+++ mldonkey/src/utils/cdk/printf2.ml   Sun Feb  5 13:19:14 2006
@@ -199,7 +199,7 @@
   (fmt : ('a,unit, unit) format )
 
 let lprintf_nl fmt =
-  cprintf (fun s -> try !lprintf_handler ((Printf.sprintf "%s" (log_time 
()))^s^"\n") with _ -> ())
+  cprintf (fun s -> try !lprintf_handler ((log_time ())^s^"\n") with _ -> ())
   (fmt : ('a,unit, unit) format )
 
 let lprintf_nl2 fmt =
Index: mldonkey/src/utils/cdk/zlib.ml
diff -u mldonkey/src/utils/cdk/zlib.ml:1.5 mldonkey/src/utils/cdk/zlib.ml:1.6
--- mldonkey/src/utils/cdk/zlib.ml:1.5  Sun Oct 16 20:42:54 2005
+++ mldonkey/src/utils/cdk/zlib.ml      Sun Feb  5 13:19:14 2006
@@ -33,7 +33,7 @@
 let zlib_version_num () =
   begin
     try
-      let s = Printf.sprintf "%s" (zlib_version ()) in s
+      zlib_version ()
     with e -> ""
   end
 
Index: mldonkey/src/utils/lib/misc2_bz2.ml
diff -u mldonkey/src/utils/lib/misc2_bz2.ml:1.2 
mldonkey/src/utils/lib/misc2_bz2.ml:1.3
--- mldonkey/src/utils/lib/misc2_bz2.ml:1.2     Tue Sep 13 09:49:40 2005
+++ mldonkey/src/utils/lib/misc2_bz2.ml Sun Feb  5 13:19:14 2006
@@ -47,6 +47,6 @@
 let bzlib_version_num () =
   begin
     try
-      let s = Printf.sprintf "%s" (Bzlib.bzlib_version ()) in s
+      Bzlib.bzlib_version ()
     with e -> ""
   end
Index: mldonkey/src/utils/net/mailer.ml
diff -u mldonkey/src/utils/net/mailer.ml:1.8 
mldonkey/src/utils/net/mailer.ml:1.9
--- mldonkey/src/utils/net/mailer.ml:1.8        Sat Jan 14 22:08:46 2006
+++ mldonkey/src/utils/net/mailer.ml    Sun Feb  5 13:19:14 2006
@@ -97,7 +97,7 @@
     bad_response ()
 
 let make_mail mail new_style =
-  let mail_date = Printf.sprintf "%s" (Date.mail_string (Unix.time ())) in
+  let mail_date = Date.mail_string (Unix.time ()) in
   
   if new_style then
        Printf.sprintf