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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/05/24 18:10:49

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonTypes.ml 
        src/networks/direct_connect: dcGlobals.ml dcInteractive.ml 
                                     dcProtocol.ml dcTypes.ml 
        src/utils/lib  : charset.ml 

Log message:
        patch #7201

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1435&r2=1.1436
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonTypes.ml?cvsroot=mldonkey&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcGlobals.ml?cvsroot=mldonkey&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcInteractive.ml?cvsroot=mldonkey&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcProtocol.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcTypes.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/charset.ml?cvsroot=mldonkey&r1=1.11&r2=1.12

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1435
retrieving revision 1.1436
diff -u -b -r1.1435 -r1.1436
--- distrib/ChangeLog   24 May 2010 18:08:17 -0000      1.1435
+++ distrib/ChangeLog   24 May 2010 18:10:49 -0000      1.1436
@@ -15,6 +15,7 @@
 =========
 
 2010/05/24
+7201: DC: Whitespace fixes (ygrek)
 7202: BT: Improve internal tracker (ygrek)
 - continue tracking files even if there are no requests
 - better logging and error reporting

Index: src/daemon/common/commonTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonTypes.ml,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79

Index: src/networks/direct_connect/dcGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcGlobals.ml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/networks/direct_connect/dcGlobals.ml    23 May 2010 09:18:31 -0000      
1.15
+++ src/networks/direct_connect/dcGlobals.ml    24 May 2010 18:10:49 -0000      
1.16
@@ -530,7 +530,7 @@
       let temp_filename = safe_filename
         (match tiger_root with
         | "" -> Printf.sprintf "DC_%s_%s" directory filename
-        | _ -> Printf.sprintf "DC_%s" tiger_root )
+        | _ -> Printf.sprintf "DC_%s" tiger_root)
       in 
       let fullname = Filename.concat !!temp_directory temp_filename in
       let temp_file = Unix32.create_rw fullname in

Index: src/networks/direct_connect/dcInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/direct_connect/dcInteractive.ml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38

Index: src/networks/direct_connect/dcProtocol.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcProtocol.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/networks/direct_connect/dcProtocol.ml   23 May 2010 09:18:31 -0000      
1.9
+++ src/networks/direct_connect/dcProtocol.ml   24 May 2010 18:10:49 -0000      
1.10
@@ -532,8 +532,8 @@
 
 module MyNick = SimpleCmd(struct let msg = "MyNick" end)
 module Quit = SimpleCmd(struct let msg = "Quit" end)
-module NickList = SimpleNickList (struct let cmd = "NickList" end)
-module OpList = SimpleNickList (struct let cmd = "OpList" end)
+module NickList = SimpleNickList(struct let cmd = "NickList" end)
+module OpList = SimpleNickList(struct let cmd = "OpList" end)
 
 module RevConnectToMe = struct
   type t = {
@@ -957,9 +957,9 @@
   | ErrorReq of string
   | FailedReq of string
   | FileLengthReq of FileLength.t
-| ForceMoveReq of ForceMove.t
+  | ForceMoveReq of ForceMove.t
   | GetListLenReq
-| GetNickListReq
+  | GetNickListReq
   | GetPassReq
   | GetReq of Get.t
   | HelloReq of Hello.t
@@ -976,12 +976,12 @@
   | MyInfoReq of DcTypes.dc_myinfo
   | MyNickReq of MyNick.t
   | MyPassReq of string
-| NickListReq of NickList.t
-| OpListReq of OpList.t
+  | NickListReq of NickList.t
+  | OpListReq of OpList.t
   | QuitReq of Quit.t
-| RevConnectToMeReq of RevConnectToMe.t
+  | RevConnectToMeReq of RevConnectToMe.t
   | SearchReq of Search.t
-| SendReq
+  | SendReq
   | SRReq of SR.t
   | SupportsReq of DcTypes.dc_supports
   | ToReq of To.t

Index: src/networks/direct_connect/dcTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcTypes.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7

Index: src/utils/lib/charset.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/charset.ml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/utils/lib/charset.ml    23 May 2010 09:18:31 -0000      1.11
+++ src/utils/lib/charset.ml    24 May 2010 18:10:49 -0000      1.12
@@ -172,7 +172,7 @@
 
(**********************************************************************************)
 
 (* taken from camomile *)
-(* $Id: charset.ml,v 1.11 2010/05/23 09:18:31 spiralvoice Exp $ *)
+(* $Id: charset.ml,v 1.12 2010/05/24 18:10:49 spiralvoice Exp $ *)
 (* Copyright 2002, 2003 Yamagata Yoriyuki. distributed with LGPL *)
 
 let utf8_look s i =
@@ -254,7 +254,7 @@
 
(**********************************************************************************)
 
 (* taken from camomile *)
-(* $Id: charset.ml,v 1.11 2010/05/23 09:18:31 spiralvoice Exp $ *)
+(* $Id: charset.ml,v 1.12 2010/05/24 18:10:49 spiralvoice Exp $ *)
 (* Copyright 2002, 2003 Yamagata Yoriyuki. distributed with LGPL *)
 
 let rec length_aux s c i =
@@ -281,7 +281,7 @@
 
 
 (* taken from camomile *)
-(* $Id: charset.ml,v 1.11 2010/05/23 09:18:31 spiralvoice Exp $ *)
+(* $Id: charset.ml,v 1.12 2010/05/24 18:10:49 spiralvoice Exp $ *)
 (* Copyright 2002, 2003 Yamagata Yoriyuki. distributed with LGPL *)
 
 external uint_code : uchar -> int = "%identity"