mldonkey-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: mldonkey-commits
Subject: [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
Date: Sun, 01 Oct 2006 17:47:11 +0000

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/01 17:47:11

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonFile.ml commonFile.mli 
        src/networks/bittorrent: bTClients.ml bTComplexOptions.ml 
                                 bTGlobals.ml bTInteractive.ml 

Log message:
        patch #5429

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1033&r2=1.1034
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.ml?cvsroot=mldonkey&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.mli?cvsroot=mldonkey&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTClients.ml?cvsroot=mldonkey&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTComplexOptions.ml?cvsroot=mldonkey&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTGlobals.ml?cvsroot=mldonkey&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.112&r2=1.113

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1033
retrieving revision 1.1034
diff -u -b -r1.1033 -r1.1034
--- distrib/ChangeLog   1 Oct 2006 17:46:11 -0000       1.1033
+++ distrib/ChangeLog   1 Oct 2006 17:47:11 -0000       1.1034
@@ -15,6 +15,7 @@
 =========
 
 2006/10/01
+5429: New common lprintf_file_nl function
 5432: Updates and fixes for the Win resource file (schlumpf)
 
 2006/09/26

Index: src/daemon/common/commonFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.ml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- src/daemon/common/commonFile.ml     23 Sep 2006 22:26:38 -0000      1.63
+++ src/daemon/common/commonFile.ml     1 Oct 2006 17:47:11 -0000       1.64
@@ -1226,3 +1226,8 @@
     T.file_user = impl.impl_file_owner;
     T.file_group = (impl_group_text impl);
   }
+
+let lprintf_file_nl file fmt =
+  lprintf_nl2 ("[" ^ (file_network file).network_shortname ^
+              "] [file_num " ^ (string_of_int (file_num file)) ^ "]" ^
+              "[temp " ^ (file_disk_name file) ^ "]") fmt

Index: src/daemon/common/commonFile.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.mli,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/daemon/common/commonFile.mli    23 Sep 2006 22:26:38 -0000      1.23
+++ src/daemon/common/commonFile.mli    1 Oct 2006 17:47:11 -0000       1.24
@@ -152,3 +152,4 @@
 val set_file_group_safe : CommonTypes.file -> string -> string option -> bool
 val file_group : CommonTypes.file -> string option
 val file_group_text : CommonTypes.file -> string
+val lprintf_file_nl : CommonTypes.file -> ('a, unit, unit) Autoconf.format -> 
'a

Index: src/networks/bittorrent/bTClients.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- src/networks/bittorrent/bTClients.ml        25 Sep 2006 23:19:08 -0000      
1.79
+++ src/networks/bittorrent/bTClients.ml        1 Oct 2006 17:47:11 -0000       
1.80
@@ -146,7 +146,7 @@
       if enabled_trackers = [] && (file_state file) <> FilePaused then
        begin
          file_pause (as_file file) CommonUserDb.admin_user;
-         lprintf_file_nl file "Paused %s, no usable trackers left" 
(file_best_name (as_file file))
+         lprintf_file_nl (as_file file) "Paused %s, no usable trackers left" 
(file_best_name (as_file file))
        end;
       file.file_trackers;
     end in
@@ -331,7 +331,7 @@
   if not ( !must_keep && (client_has_a_slot (as_client c) || 
c.client_interested)) then
     begin
       if !verbose_msg_clients then
-        lprintf_file_nl file "disconnect since download is finished";
+        lprintf_file_nl (as_file file) "disconnect since download is finished";
       disconnect_client c Closed_by_user
     end
   ) file.file_clients
@@ -456,12 +456,12 @@
 
     let file = Hashtbl.find files_by_uid file_id in
     if !verbose_msg_clients then
-      lprintf_file_nl file "file found";
+      lprintf_file_nl (as_file file) "file found";
     let c =
       match !cc with
         None ->
           let c = new_client file Sha1.null (TcpBufferedSocket.peer_addr sock) 
in
-          if !verbose_connect then lprintf_file_nl file "Client %d: incoming 
connection" (client_num c);
+          if !verbose_connect then lprintf_file_nl (as_file file) "Client %d: 
incoming connection" (client_num c);
           cc := Some c;
           c
       | Some c ->
@@ -625,9 +625,8 @@
   
     let num, x,y, r =
 
-      if !verbose_msg_clients then begin
-        lprintf_file_nl file "CLIENT %d: Finding new range to send" 
(client_num c);
-      end;
+      if !verbose_msg_clients then
+        lprintf_file_nl (as_file file) "CLIENT %d: Finding new range to send" 
(client_num c);
 
       if !verbose_swarming then begin
         lprintf_n "Current download:\n  Current chunks: ";
@@ -660,7 +659,7 @@
 
         lprint_newline ();
       
-        lprintf_file_nl file "Finding Range:";
+        lprintf_file_nl (as_file file) "Finding Range:";
       end;
 
       try
@@ -675,7 +674,7 @@
 
           | None -> 
 
-              if !verbose_swarming then lprintf_file_nl file "No block";
+              if !verbose_swarming then lprintf_file_nl (as_file file) "No 
block";
               update_client_bitmap c;
               (try CommonSwarming.verify_one_chunk swarmer with _ -> ());
               (*Find a free block in the swarmer*)
@@ -729,7 +728,7 @@
    number. Only matters with merged downloads, and even then other
    clients didn't seem to care (?), so the bug remained hidden *)
                   if !verbose_swarming then 
-                    lprintf_file_nl file "Asking %d For Range %Ld-%Ld" chunk x 
y;
+                    lprintf_file_nl (as_file file) "Asking %d For Range 
%Ld-%Ld" chunk x y;
                       
                   chunk, x -- file.file_piece_size ** Int64.of_int chunk, y -- 
x, r
 
@@ -764,12 +763,12 @@
     send_client c (Request (num,x,y));
 
     if !verbose_msg_clients then
-      lprintf_file_nl file "CLIENT %d: Asking %s For Range %Ld-%Ld"
+      lprintf_file_nl (as_file file) "CLIENT %d: Asking %s For Range %Ld-%Ld"
         (client_num c) (Sha1.to_string c.client_uid) x y
 
   with Not_found ->
         if not (CommonSwarming.check_finished swarmer) && !verbose_download 
then
-          lprintf_file_nl file "BTClient.get_from_client ERROR: can't find a 
block to download and file is not yet finished for file : %s..." file.file_name
+          lprintf_file_nl (as_file file) "BTClient.get_from_client ERROR: 
can't find a block to download and file is not yet finished for file : %s..." 
file.file_name
 
 
 (** In this function we match a message sent by a client
@@ -821,10 +820,10 @@
 
             if !verbose_msg_clients then
               (match c.client_ranges_sent with
-                  [] -> lprintf_file_nl file "EMPTY Ranges !!!"
+                  [] -> lprintf_file_nl (as_file file) "EMPTY Ranges !!!"
                 | (p1,p2,r) :: _ ->
                     let (x,y) = CommonSwarming.range_range r in
-                    lprintf_file_nl file "Current range from %s : %Ld [%d] 
(asked %Ld-%Ld[%Ld-%Ld])"
+                    lprintf_file_nl (as_file file) "Current range from %s : 
%Ld [%d] (asked %Ld-%Ld[%Ld-%Ld])"
                       (brand_to_string c.client_brand) position len
                       p1 p2 x y
               );
@@ -844,10 +843,10 @@
             Rate.update c.client_downloaded_rate  (float_of_int len);
             if !verbose_msg_clients then
               (match c.client_ranges_sent with
-                  [] -> lprintf_file_nl file "EMPTY Ranges !!!"
+                  [] -> lprintf_file_nl (as_file file) "EMPTY Ranges !!!"
                 | (p1,p2,r) :: _ ->
                     let (x,y) = CommonSwarming.range_range r in
-                    lprintf_file_nl file "Received %Ld [%d] %Ld-%Ld[%Ld-%Ld] 
-> %Ld"
+                    lprintf_file_nl (as_file file) "Received %Ld [%d] 
%Ld-%Ld[%Ld-%Ld] -> %Ld"
                       position len
                       p1 p2 x y
                       (new_downloaded -- old_downloaded)
@@ -933,7 +932,7 @@
               let nbits = String.length p * 8 in
 
               if nbits < npieces then begin
-                lprintf_file_nl file "Error: expected bitfield of atleast %d 
but got %d" npieces nbits;
+                lprintf_file_nl (as_file file) "Error: expected bitfield of 
atleast %d but got %d" npieces nbits;
                 disconnect_client c (Closed_for_error "Wrong bitfield length")
               end else begin
 
@@ -956,7 +955,7 @@
                   send_interested c;
 
                 if !verbose_msg_clients then
-                  lprintf_file_nl file "New BitField Registered";
+                  lprintf_file_nl (as_file file) "New BitField Registered";
 
                 (*  for i = 1 to max_range_requests - List.length 
c.client_ranges do
                       (try get_from_client sock c with _ -> ())
@@ -1025,7 +1024,7 @@
                 (* Afaik this is no protocol violation and happens if the 
client
                    didn't send a client bitmap after the handshake. *)
                 let (ip,port) = c.client_host in
-                  if !verbose_msg_clients then lprintf_file_nl file "%s:%d 
with software %s : Choke send, but no client bitmap"
+                  if !verbose_msg_clients then lprintf_file_nl (as_file file) 
"%s:%d with software %s : Choke send, but no client bitmap"
                     (Ip.to_string ip) port (brand_to_string c.client_brand)
             | Some up ->
                 CommonSwarming.clear_uploader_intervals up
@@ -1090,10 +1089,10 @@
           c.client_upload_requests <- List2.remove_first (n, pos, len) 
c.client_upload_requests
         else
           if !verbose_msg_clients then
-            lprintf_file_nl file "Error: received cancel request but client 
has no slot"
+            lprintf_file_nl (as_file file) "Error: received cancel request but 
client has no slot"
 
   with e ->
-      lprintf_file_nl file "Error %s while handling MESSAGE: %s" 
(Printexc2.to_string e) (TcpMessages.to_string msg)
+      lprintf_file_nl (as_file file) "Error %s while handling MESSAGE: %s" 
(Printexc2.to_string e) (TcpMessages.to_string msg)
 
 
 (** The function used to connect to a client.
@@ -1158,7 +1157,7 @@
                   let file = c.client_file in
 
                   if !verbose_msg_clients then
-                    lprintf_file_nl file "READY TO DOWNLOAD FILE";
+                    lprintf_file_nl (as_file file) "READY TO DOWNLOAD FILE";
 
                   send_init !!client_uid file.file_id sock;
 (* Fabrice: Initialize the client bitmap and uploader fields to <> None *)
@@ -1306,7 +1305,7 @@
              with _ -> ())
       with e ->
           if !verbose_connect then
-            lprintf_file_nl file "Exception %s in resume_clients"   
(Printexc2.to_string e)
+            lprintf_file_nl (as_file file) "Exception %s in resume_clients"   
(Printexc2.to_string e)
   ) file.file_clients
 
 (** Check if the value replied by the tracker is correct.
@@ -1343,13 +1342,13 @@
     let tracker_reply =
       try
         File.to_string filename
-      with e -> lprintf_file_nl file "Empty reply from tracker"; ""
+      with e -> lprintf_file_nl (as_file file) "Empty reply from tracker"; ""
     in
     let v =
        match tracker_reply with
        | "" ->
         if !verbose_connect then
-          lprintf_file_nl file "Empty reply from tracker";
+          lprintf_file_nl (as_file file) "Empty reply from tracker";
         Bencode.decode ""
        | _ -> Bencode.decode tracker_reply
     in
@@ -1363,10 +1362,10 @@
             | String "failure reason", String failure ->
                 (* On failure, disable the tracker and forbid re-enabling *)
                t.tracker_status <- Disabled_failure (intern failure);
-                lprintf_file_nl file "Failure from Tracker %s in file: %s 
Reason: %s\nBT: Tracker %s disabled for failure"
+                lprintf_file_nl (as_file file) "Failure from Tracker %s in 
file: %s Reason: %s\nBT: Tracker %s disabled for failure"
                   t.tracker_url file.file_name (Charset.to_utf8 failure) 
t.tracker_url
             | String "warning message", String warning ->
-                lprintf_file_nl file "Warning from Tracker %s in file: %s 
Reason: %s" t.tracker_url file.file_name warning
+                lprintf_file_nl (as_file file) "Warning from Tracker %s in 
file: %s Reason: %s" t.tracker_url file.file_name warning
             | String "interval", Int n ->
                 t.tracker_interval <- chk_keyval (Bencode.print key) n 
t.tracker_url file.file_name;
                 (* in case we don't receive "min interval" *)
@@ -1397,11 +1396,11 @@
             | String "key", String n ->
                 t.tracker_key <- n;
                 if !verbose_msg_clients then
-                  lprintf_file_nl file "%s in file: %s has key: %s" 
t.tracker_url file.file_name n
+                  lprintf_file_nl (as_file file) "%s in file: %s has key: %s" 
t.tracker_url file.file_name n
             | String "tracker id", String n ->
                 t.tracker_id <- n;
                 if !verbose_msg_clients then
-                  lprintf_file_nl file "%s in file: %s has tracker id %s" 
t.tracker_url file.file_name n
+                  lprintf_file_nl (as_file file) "%s in file: %s has tracker 
id %s" t.tracker_url file.file_name n
 
             | String "peers", List list ->
                 List.iter (fun v ->
@@ -1433,13 +1432,13 @@
                               None -> true
                             | Some reason ->
                                 if !verbose_connect then
-                                  lprintf_file_nl file "%s:%d blocked: %s"
+                                  lprintf_file_nl (as_file file) "%s:%d 
blocked: %s"
                                     (Ip.to_string !peer_ip) !port reason;
                                 false)
                         then
                           let _ = new_client file !peer_id (!peer_ip,!port)
                           in
-                          if !verbose_sources > 1 then lprintf_file_nl file 
"Received %s:%d" (Ip.to_string !peer_ip)
+                          if !verbose_sources > 1 then lprintf_file_nl 
(as_file file) "Received %s:%d" (Ip.to_string !peer_ip)
                           !port;
                           ()
                     | _ -> assert false
@@ -1460,12 +1459,12 @@
             | String "private", Int n -> ()
               (* TODO: if set to 1, disable peer exchange *)
 
-            | _ -> lprintf_file_nl file "received unknown entry in answer from 
tracker: %s : %s" (Bencode.print key) (Bencode.print value)
+            | _ -> lprintf_file_nl (as_file file) "received unknown entry in 
answer from tracker: %s : %s" (Bencode.print key) (Bencode.print value)
         ) list;
        (*Now, that we have added new clients to a file, it's time
          to connect to them*)
         if !verbose_sources > 0 then
-          lprintf_file_nl file "get_sources_from_tracker: got %i source(s) for 
file %s"
+          lprintf_file_nl (as_file file) "get_sources_from_tracker: got %i 
source(s) for file %s"
             t.tracker_last_clients_num file.file_name;
         resume_clients file
 
@@ -1494,7 +1493,7 @@
               (try
                   connect_trackers file "" (fun _ _ -> ()) with _ -> ())
           | FilePaused -> () (*when we are paused we do nothing, not even 
logging this vvvv*)
-          | s -> lprintf_file_nl file "Other state %s!!" (string_of_state s)
+          | s -> lprintf_file_nl (as_file file) "Other state %s!!" 
(string_of_state s)
       ) !current_files
 
 let upload_buffer = String.create 100000
@@ -1594,7 +1593,7 @@
     if file.file_tracker_connected then
     begin
       connect_trackers file "stopped" (fun _ _ ->
-          lprintf_file_nl file "Tracker return: stopped %s" file.file_name;
+          lprintf_file_nl (as_file file) "Tracker return: stopped %s" 
file.file_name;
           file.file_tracker_connected <- false)
     end
 

Index: src/networks/bittorrent/bTComplexOptions.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/bittorrent/bTComplexOptions.ml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/networks/bittorrent/bTComplexOptions.ml 19 Sep 2006 17:07:43 -0000      
1.37
+++ src/networks/bittorrent/bTComplexOptions.ml 1 Oct 2006 17:47:11 -0000       
1.38
@@ -250,7 +250,7 @@
         CommonSwarming.frontend_to_value swarmer assocs
   with
     e ->
-      lprintf_file_nl file "exception %s in file_to_value"
+      lprintf_file_nl (as_file file) "exception %s in file_to_value"
         (Printexc2.to_string e); raise e
 
 

Index: src/networks/bittorrent/bTGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/networks/bittorrent/bTGlobals.ml        25 Sep 2006 23:19:08 -0000      
1.67
+++ src/networks/bittorrent/bTGlobals.ml        1 Oct 2006 17:47:11 -0000       
1.68
@@ -126,10 +126,6 @@
 let lprintf_nl fmt =
   lprintf_nl2 log_prefix fmt
 
-let lprintf_file_nl  file fmt  =
-  lprintf_nl2 (log_prefix^" [file_num "^(string_of_int (file_num file))^"]") 
fmt
-
-    
 let lprintf_n fmt =
   lprintf2 log_prefix fmt
 

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- src/networks/bittorrent/bTInteractive.ml    25 Sep 2006 23:19:08 -0000      
1.112
+++ src/networks/bittorrent/bTInteractive.ml    1 Oct 2006 17:47:11 -0000       
1.113
@@ -101,7 +101,7 @@
       set_file_state file FileShared;
 
       if Unix32.destroyed (file_fd file) then
-        if !verbose then lprintf_file_nl file "op_file_commit: FD is 
destroyed... repairing";
+        if !verbose then lprintf_file_nl (as_file file) "op_file_commit: FD is 
destroyed... repairing";
 
 (* During the commit operation, for security, the file_fd is destroyed. So
   we create it again to be able to share this file again. *)
@@ -110,7 +110,7 @@
         (create_temp_file new_name (List.map (fun (file,size,_) -> 
(file,size)) file.file_files) (file_state file));
 
       if Unix32.destroyed (file_fd file) then
-        lprintf_file_nl file "op_file_commit: FD is destroyed... could not 
repair!";
+        lprintf_file_nl (as_file file) "op_file_commit: FD is destroyed... 
could not repair!";
 
       let new_torrent_diskname =
         Filename.concat seeded_directory
@@ -119,7 +119,7 @@
       (try
           Unix2.rename file.file_torrent_diskname new_torrent_diskname;
         with _ ->
-          (lprintf_file_nl file "op_file_commit: failed to rename %s to %s"
+          (lprintf_file_nl (as_file file) "op_file_commit: failed to rename %s 
to %s"
               file.file_torrent_diskname new_torrent_diskname));
       file.file_torrent_diskname <- new_torrent_diskname;
 
@@ -446,10 +446,10 @@
     end
 
 let op_file_check file =
-  lprintf_file_nl file "Checking chunks of %s" file.file_name;
+  lprintf_file_nl (as_file file) "Checking chunks of %s" file.file_name;
   match file.file_swarmer with
     None ->
-      lprintf_file_nl file "verify_chunks: no swarmer to verify chunks"
+      lprintf_file_nl (as_file file) "verify_chunks: no swarmer to verify 
chunks"
   | Some swarmer ->
       CommonSwarming.verify_all_chunks_immediately swarmer
 
@@ -584,21 +584,21 @@
 (*This is the function which will be called by the http client
 for parsing the response*)
 (* Interested only in interval*)
-  if !verbose_msg_servers then lprintf_file_nl file "Filename %s" filename;
+  if !verbose_msg_servers then lprintf_file_nl (as_file file) "Filename %s" 
filename;
     let tracker_reply =
       try
         File.to_string filename
-      with e -> lprintf_file_nl file "Empty reply from tracker"; ""
+      with e -> lprintf_file_nl (as_file file) "Empty reply from tracker"; ""
     in
     let v =
        match tracker_reply with
        | "" ->
         if !verbose_connect then
-          lprintf_file_nl file "Empty reply from tracker";
+          lprintf_file_nl (as_file file) "Empty reply from tracker";
         Bencode.decode ""
        | _ -> Bencode.decode tracker_reply
     in
-  if !verbose_msg_servers then lprintf_file_nl file "Received: %s" 
(Bencode.print v);
+  if !verbose_msg_servers then lprintf_file_nl (as_file file) "Received: %s" 
(Bencode.print v);
   t.tracker_interval <- 600;
   match v with
     Dictionary list ->
@@ -606,9 +606,9 @@
           match (key, value) with
             String "interval", Int n ->
               t.tracker_interval <- Int64.to_int n;
-              if !verbose_msg_servers then lprintf_file_nl file ".. interval 
%d .." t.tracker_interval
+              if !verbose_msg_servers then lprintf_file_nl (as_file file) ".. 
interval %d .." t.tracker_interval
           | String "failure reason", String failure ->
-                lprintf_file_nl file "Failure from Tracker in file: %s Reason: 
%s"  file.file_name failure
+                lprintf_file_nl (as_file file) "Failure from Tracker in file: 
%s Reason: %s"  file.file_name failure
           (*TODO: merge with f from get_sources_from_tracker and parse the 
rest of the answer, too.
             also connect to the sources we receive or instruct tracker to send 
none, perhaps based
             on an config option. firewalled people could activate the option 
and then seed torrents, too.*)
@@ -646,7 +646,7 @@
     let file = new_file file_id torrent torrent_diskname
         filename FileShared CommonUserDb.admin_user in
     BTShare.must_share_file file;
-    if !verbose_share then lprintf_file_nl file "Sharing file %s" filename;
+    if !verbose_share then lprintf_file_nl (as_file file) "Sharing file %s" 
filename;
     BTClients.connect_trackers file "started"
       (parse_tracker_reply file)
   with
@@ -1055,7 +1055,7 @@
           Hashtbl.iter (fun _ file ->
               if file_num file = num then begin
                   if !verbose then
-                    lprintf_file_nl file "adding trackers for file %i" num;
+                    lprintf_file_nl (as_file file) "adding trackers for file 
%i" num;
                   set_trackers file !urls;
                   raise Exit
                 end
@@ -1171,7 +1171,7 @@
   CommonNetwork.register_commands commands;
 
   shared_ops.op_shared_unshare <- (fun file ->
-      (if !verbose_share then lprintf_file_nl file "unshare file");
+      (if !verbose_share then lprintf_file_nl (as_file file) "unshare file");
       BTShare.unshare_file file);
   shared_ops.op_shared_info <- (fun file ->
    let module T = GuiTypes in




reply via email to

[Prev in Thread] Current Thread [Next in Thread]