[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/07/18 14:49:59

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTInteractive.ml 

Log message:
        patch #7251

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1446&r2=1.1447
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.157&r2=1.158

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1446
retrieving revision 1.1447
diff -u -b -r1.1446 -r1.1447
--- distrib/ChangeLog   18 Jul 2010 10:59:19 -0000      1.1446
+++ distrib/ChangeLog   18 Jul 2010 14:49:59 -0000      1.1447
@@ -15,6 +15,7 @@
 =========
 
 2010/07/18
+7251: BT: OCaml 3.08.3 compatibility fix (ygrek)
 7250: DC: discover self IP (ygrek)
 7249: DC: fix parsing MyINFO with non-latin nicks (ygrek)
 

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- src/networks/bittorrent/bTInteractive.ml    17 Jul 2010 10:18:07 -0000      
1.157
+++ src/networks/bittorrent/bTInteractive.ml    18 Jul 2010 14:49:59 -0000      
1.158
@@ -1052,7 +1052,12 @@
     Filename.concat (Sys.getcwd ()) torrent_path,
     try `Ok (BTTracker.track_torrent basename file_id) with exn -> `Err 
(Printexc2.to_string exn)
 
-let text fmt = Printf.ksprintf (fun s -> `Text s) fmt
+(* let text fmt = Printf.ksprintf (fun s -> `Text s) fmt *)
+(* 
+  OCaml 3.08.3 compatibility (ksprintf not available)
+  http://mldonkey.sourceforge.net/phpBB2/viewtopic.php?p=30453 
+*)
+let text s = `Text s
 let link name url = `Link (name,url)
 
 let output buf typ elements =
@@ -1105,16 +1110,16 @@
 
         let (path,url) = compute_torrent !filename "" !comment in
         [
-          text "Torrent file generated : %s" path;
+          text (Printf.sprintf "Torrent file generated : %s" path);
           `Break;
           (match url with
           | `Ok url -> link "Download" url
-          | `Err s -> text "Not tracked : %s" s);
+          | `Err s -> text (Printf.sprintf "Not tracked : %s" s));
           `Break
         ]
       with 
       | Not_found -> [text "Not enough parameters"; `Break]
-      | exn -> [text "Error: %s" (Printexc2.to_string exn); `Break]
+      | exn -> [text (Printf.sprintf "Error: %s" (Printexc2.to_string exn)); 
`Break]
       end;
       ""
     ), _s "<filename> [<comment>] :\tgenerate the corresponding <filename> 
.torrent file with <comment>.\n\t\t\t\t\t\tThe file is automatically tracked if 
tracker is enabled and seeded if located in incoming/";